[SCM] Debian packaging of libgnome2-gconf-perl branch, master, updated. abe9478fd1cdf484c0c92a67d68add8237d6596f

[gregor herrmann]

The following commit has been merged in the master branch:
commit eac9e328ad8c0fddd589374b212d138db3b09a3d
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Nov 17 18:26:43 2011 +0100

    Add patch disable-orbit: "Disable gconf_engine_key_is_writable.  This symbol
    is not available in libgconf when it is configured without ORBit support."
    
    Closes: #649055
    Thanks: Colin Watson for the patch

diff --git a/debian/patches/disable-orbit b/debian/patches/disable-orbit
new file mode 100644
index 0000000..da526ec
--- /dev/null
+++ b/debian/patches/disable-orbit
@@ -0,0 +1,30 @@
+Description: Disable gconf_engine_key_is_writable
+ This symbol is not available in libgconf when it is configured without
+ ORBit support, which is currently the case in Debian.
+Author: Colin Watson <cjwatson at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/649055
+Forwarded: no
+Last-Update: 2011-11-17
+
+Index: b/xs/GConfEngine.xs
+===================================================================
+--- a/xs/GConfEngine.xs
++++ b/xs/GConfEngine.xs
+@@ -350,6 +350,8 @@
+ 	if (err)
+ 		gperl_croak_gerror (NULL, err);
+ 
++#if 0 /* requires gconf to be configured with ORBit support */
++
+ ##gboolean gconf_engine_key_is_writable  (GConfEngine *conf,
+ ##                                        const gchar *key,
+ ##                                        GError     **err);
+@@ -366,6 +368,8 @@
+     OUTPUT:
+         RETVAL
+ 
++#endif
++
+ guint
+ gconf_engine_notify_add (engine, namespace_section, func, data=NULL)
+ 	GConfEngine * engine
diff --git a/debian/patches/series b/debian/patches/series
index 726125e..9feb55a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-useless-whatis-entries
+disable-orbit

-- 
Debian packaging of libgnome2-gconf-perl