r25794 - in /desktop/experimental/gconf/debian: changelog patches/01_defaults_path.patch patches/02_fix_wrong_return_value.patch patches/25_gconf-path-max-hurd.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Dec  5 23:59:10 2010
New Revision: 25794

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25794
Log:
* debian/patches/*:
  - Updated to apply cleanly.

Modified:
    desktop/experimental/gconf/debian/changelog
    desktop/experimental/gconf/debian/patches/01_defaults_path.patch
    desktop/experimental/gconf/debian/patches/02_fix_wrong_return_value.patch
    desktop/experimental/gconf/debian/patches/25_gconf-path-max-hurd.patch

Modified: desktop/experimental/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/changelog?rev=25794&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gconf/debian/changelog [utf-8] Sun Dec  5 23:59:10 2010
@@ -25,6 +25,8 @@
 
   [ Emilio Pozuelo Monfort ]
   * Switch to source format 3.0 (quilt).
+  * debian/patches/*:
+    - Updated to apply cleanly.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 06 Dec 2010 00:53:14 +0100
 

Modified: desktop/experimental/gconf/debian/patches/01_defaults_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/patches/01_defaults_path.patch?rev=25794&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/patches/01_defaults_path.patch [utf-8] (original)
+++ desktop/experimental/gconf/debian/patches/01_defaults_path.patch [utf-8] Sun Dec  5 23:59:10 2010
@@ -1,6 +1,5 @@
-diff -urN GConf-2.28.0.orig/defaults/gconf-defaults.c GConf-2.28.0/defaults/gconf-defaults.c
---- GConf-2.28.0.orig/defaults/gconf-defaults.c	2009-08-19 17:35:32.000000000 +0200
-+++ GConf-2.28.0/defaults/gconf-defaults.c	2009-10-04 12:17:01.000000000 +0200
+--- a/defaults/gconf-defaults.c
++++ b/defaults/gconf-defaults.c
 @@ -811,7 +811,7 @@
  	else {
  		adata->annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
@@ -10,10 +9,9 @@
  	}
  
          polkit_authority_enumerate_actions (mechanism->priv->auth,
-diff -urN GConf-2.28.0.orig/gconf/gconfd.c GConf-2.28.0/gconf/gconfd.c
---- GConf-2.28.0.orig/gconf/gconfd.c	2009-08-19 17:35:32.000000000 +0200
-+++ GConf-2.28.0/gconf/gconfd.c	2009-10-04 12:16:44.000000000 +0200
-@@ -637,7 +637,7 @@
+--- a/gconf/gconfd.c
++++ b/gconf/gconfd.c
+@@ -667,7 +667,7 @@
  
  	  gconf_log (GCL_DEBUG, "System defaults changed.  Notifying.");
  

Modified: desktop/experimental/gconf/debian/patches/02_fix_wrong_return_value.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/patches/02_fix_wrong_return_value.patch?rev=25794&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/patches/02_fix_wrong_return_value.patch [utf-8] (original)
+++ desktop/experimental/gconf/debian/patches/02_fix_wrong_return_value.patch [utf-8] Sun Dec  5 23:59:10 2010
@@ -4,7 +4,7 @@
 
 --- a/gconf/gconf-client.c
 +++ b/gconf/gconf-client.c
-@@ -2025,7 +2025,7 @@
+@@ -2163,7 +2163,7 @@
      {
        g_free (dir);
        trace ("Negative cache hit on %s", key);

Modified: desktop/experimental/gconf/debian/patches/25_gconf-path-max-hurd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/patches/25_gconf-path-max-hurd.patch?rev=25794&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/patches/25_gconf-path-max-hurd.patch [utf-8] (original)
+++ desktop/experimental/gconf/debian/patches/25_gconf-path-max-hurd.patch [utf-8] Sun Dec  5 23:59:10 2010
@@ -1,9 +1,8 @@
-diff -Naur GConf-2.6.4.orig/backends/markup-tree.c GConf-2.6.4/backends/markup-tree.c
---- GConf-2.8.1.orig/backends/markup-tree.c	2004-09-29 14:09:44.000000000 +0200
-+++ GConf-2.8.1/backends/markup-tree.c	2004-09-29 14:14:01.000000000 +0200
-@@ -34,6 +34,11 @@
- #include <stdio.h>
- #include <time.h>
+--- a/backends/markup-tree.c
++++ b/backends/markup-tree.c
+@@ -71,6 +71,11 @@
+ }
+ #endif
  
 +/* PATH_MAX is not defined in limits.h on some platforms */
 +#ifndef PATH_MAX
@@ -13,11 +12,10 @@
  typedef struct
  {
    char       *locale;
-diff -Naur GConf-2.6.4.orig/backends/xml-dir.c GConf-2.6.4/backends/xml-dir.c
---- GConf-2.8.1.orig/backends/xml-dir.c	2004-09-29 14:09:44.000000000 +0200
-+++ GConf-2.8.1/backends/xml-dir.c	2004-09-29 14:11:59.000000000 +0200
+--- a/backends/xml-dir.c
++++ b/backends/xml-dir.c
 @@ -36,6 +36,11 @@
-
+ 
  #include "gconf/gconf-internals.h"
  
 +/* PATH_MAX is not defined in limits.h on some platforms */