r38414 - in /desktop/unstable/gconf/debian: changelog patches/01_defaults_path.patch patches/04_manpage.patch patches/05_readd_gconf_engine_key_is_writable.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jun  6 01:12:22 2013
New Revision: 38414

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38414
Log:
Remove 04_manpage.patch, merged upstream. Refresh other patches.

Removed:
    desktop/unstable/gconf/debian/patches/04_manpage.patch
Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/patches/01_defaults_path.patch
    desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch
    desktop/unstable/gconf/debian/patches/series

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=38414&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Thu Jun  6 01:12:22 2013
@@ -9,6 +9,7 @@
 
   [ Michael Biebl ]
   * New upstream release.
+  * Remove 04_manpage.patch, merged upstream. Refresh other patches.
 
  -- Martin Pitt <mpitt at debian.org>  Thu, 15 Nov 2012 13:29:47 +0100
 

Modified: desktop/unstable/gconf/debian/patches/01_defaults_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/01_defaults_path.patch?rev=38414&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/01_defaults_path.patch [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/01_defaults_path.patch [utf-8] Thu Jun  6 01:12:22 2013
@@ -1,7 +1,7 @@
-Index: GConf-3.2.5/defaults/gconf-defaults.c
+Index: GConf-3.2.6/defaults/gconf-defaults.c
 ===================================================================
---- GConf-3.2.5.orig/defaults/gconf-defaults.c	2012-03-07 19:08:55.000000000 +0100
-+++ GConf-3.2.5/defaults/gconf-defaults.c	2012-04-26 18:33:36.134860479 +0200
+--- GConf-3.2.6.orig/defaults/gconf-defaults.c	2013-06-06 02:38:14.471252652 +0200
++++ GConf-3.2.6/defaults/gconf-defaults.c	2013-06-06 02:38:14.463252560 +0200
 @@ -811,7 +811,7 @@
  	else {
  		adata->annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
@@ -11,11 +11,11 @@
  	}
  
          polkit_authority_enumerate_actions (mechanism->priv->auth,
-Index: GConf-3.2.5/gconf/gconfd.c
+Index: GConf-3.2.6/gconf/gconfd.c
 ===================================================================
---- GConf-3.2.5.orig/gconf/gconfd.c	2012-03-07 19:08:55.000000000 +0100
-+++ GConf-3.2.5/gconf/gconfd.c	2012-04-26 18:33:36.138860479 +0200
-@@ -709,7 +709,7 @@
+--- GConf-3.2.6.orig/gconf/gconfd.c	2013-06-06 02:38:14.471252652 +0200
++++ GConf-3.2.6/gconf/gconfd.c	2013-06-06 02:38:14.463252560 +0200
+@@ -705,7 +705,7 @@
  
  	  gconf_log (GCL_DEBUG, "System defaults changed.  Notifying.");
  

Modified: desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch?rev=38414&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch [utf-8] Thu Jun  6 01:12:22 2013
@@ -11,11 +11,11 @@
  gconf/gconf-dbus.c |   23 +++++++++++++++++++++++
  1 files changed, 23 insertions(+), 0 deletions(-)
 
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index 442a94b..9eda515 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -2194,6 +2194,29 @@ gconf_engine_remove_dir (GConfEngine* conf,
+Index: GConf-3.2.6/gconf/gconf-dbus.c
+===================================================================
+--- GConf-3.2.6.orig/gconf/gconf-dbus.c	2013-06-06 02:39:13.243932775 +0200
++++ GConf-3.2.6/gconf/gconf-dbus.c	2013-06-06 02:39:13.239932729 +0200
+@@ -2195,6 +2195,29 @@
      }
  }
  
@@ -45,5 +45,3 @@
  static void
  cnxn_get_all_func (gpointer key,
  		   gpointer value,
--- 
-1.7.9

Modified: desktop/unstable/gconf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/series?rev=38414&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/series [utf-8] Thu Jun  6 01:12:22 2013
@@ -1,5 +1,4 @@
 01_defaults_path.patch
 02_fix_wrong_return_value.patch
-04_manpage.patch
 05_readd_gconf_engine_key_is_writable.patch
 25_gconf-path-max-hurd.patch