Merge branch 'fix-file-roller-gthumb-args' into 'belenos'

Add G_APPLICATION_HANDLES_COMMAND_LINE to file-roller, gthumb

This way we can open multiple archives/pictures at once from Nautilus.

See merge request !160

helpers/DATA/gthumb/20-set_handles_command_line.patch

+From e99664c67254fee3df1b53caa2e2a67b0bb86576 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Sun, 19 Jan 2014 18:27:28 +0100
+Subject: set G_APPLICATION_HANDLES_COMMAND_LINE for the application
+
+[bug #728341]
+---
+ gthumb/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gthumb/main.c b/gthumb/main.c
+index f3f887a..3986c7d 100644
+--- a/gthumb/main.c
++++ b/gthumb/main.c
+@@ -716,7 +716,7 @@ gth_application_new (void)
+         return g_object_new (gth_application_get_type (),
+                              "application-id", "org.gnome.Gthumb",
+                              "register-session", TRUE, /* required to call gtk_application_inhibit */
+-                             "flags", 0,
++                             "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
+                              NULL);
+ }
+ 

helpers/make-file-roller

@@ -17,15 +17,20 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 COMPONENT=main
 QUILT=skip
 
 . ./config
 
 sed 's/--enable-magic/--enable-magic --disable-packagekit/' debian/rules -i
+rm debian/patches/01_package_names.patch
+sed '/^01_package_names\.patch/d' debian/patches/series -i
 
-changelog "Dissabled package recommendations, fixes #7747"
+export QUILT_PATCHES=debian/patches
+quilt push -a
+
+changelog "Disabled package recommendations, fixes #7747"
 
 compile
 

helpers/make-gthumb

+#!/bin/sh
+#
+#    Copyright (C) 2009-2010  Rubén Rodríguez <ruben@gnu.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+QUILT=skip
+. ./config
+
+cp $DATA/*.patch debian/patches/
+echo 20-set_handles_command_line.patch >> debian/patches/series
+
+export QUILT_PATCHES=debian/patches
+quilt push -a
+
+changelog "Fixed to allow opening multiple instances from e.g. Nautilus"
+compile