r23591 - in /desktop/unstable/file-roller/debian: changelog patches/01_nodbus_build.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr  8 07:42:13 2010
New Revision: 23591

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23591
Log:
01_nodbus_build.patch: new patch. Fix FTBFS with PackageKit support 
disabled.

Added:
    desktop/unstable/file-roller/debian/patches/01_nodbus_build.patch
Modified:
    desktop/unstable/file-roller/debian/changelog
    desktop/unstable/file-roller/debian/patches/series

Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=23591&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog [utf-8] (original)
+++ desktop/unstable/file-roller/debian/changelog [utf-8] Thu Apr  8 07:42:13 2010
@@ -1,3 +1,10 @@
+file-roller (2.30.0-2) unstable; urgency=low
+
+  * 01_nodbus_build.patch: new patch. Fix FTBFS with PackageKit support 
+    disabled.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 08 Apr 2010 09:27:05 +0200
+
 file-roller (2.30.0-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/file-roller/debian/patches/01_nodbus_build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/01_nodbus_build.patch?rev=23591&op=file
==============================================================================
--- desktop/unstable/file-roller/debian/patches/01_nodbus_build.patch (added)
+++ desktop/unstable/file-roller/debian/patches/01_nodbus_build.patch [utf-8] Thu Apr  8 07:42:13 2010
@@ -1,0 +1,43 @@
+GNOME #615127
+
+Index: file-roller-2.30.0/src/dlg-package-installer.c
+===================================================================
+--- file-roller-2.30.0.orig/src/dlg-package-installer.c	2010-04-08 09:21:10.146216009 +0200
++++ file-roller-2.30.0/src/dlg-package-installer.c	2010-04-08 09:38:01.622223758 +0200
+@@ -25,7 +25,11 @@
+ #include <glib/gi18n.h>
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
++
++#ifdef ENABLE_PACKAGEKIT
+ #include <dbus/dbus-glib.h>
++#endif /* ENABLE_PACKAGEKIT */
++
+ #include "dlg-package-installer.h"
+ #include "gtk-utils.h"
+ #include "main.h"
+@@ -76,6 +80,7 @@ package_installer_terminated (InstallerD
+ }
+ 
+ 
++#ifdef ENABLE_PACKAGEKIT
+ static void
+ packagekit_install_package_call_notify_cb (DBusGProxy     *proxy,
+ 					   DBusGProxyCall *call,
+@@ -216,6 +221,7 @@ confirm_search_dialog_response_cb (GtkDi
+ 		installer_data_free (idata);
+ 	}
+ }
++#endif /* ENABLE_PACKAGEKIT */
+ 
+ 
+ void
+@@ -226,8 +232,6 @@ dlg_package_installer (FrWindow  *window
+ 	InstallerData   *idata;
+ 	GType            command_type;
+ 	FrCommand       *command;
+-	DBusGConnection *connection;
+-	gboolean         success = FALSE;
+ 
+ 	idata = g_new0 (InstallerData, 1);
+ 	idata->window = g_object_ref (window);

Modified: desktop/unstable/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/series?rev=23591&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/series [utf-8] (original)
+++ desktop/unstable/file-roller/debian/patches/series [utf-8] Thu Apr  8 07:42:13 2010
@@ -1,1 +1,2 @@
+01_nodbus_build.patch
 99_ltmain_as-needed.patch