r34615 - in /desktop/unstable/glib2.0/debian: changelog patches/revert_schema_path_warning.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr 26 21:13:11 2012
New Revision: 34615

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34615
Log:
debian/patches/revert_schema_path_warning.patch: Revert upstream commit
which generates a warning for applications using a non-recommended
gsettings path. Final freeze is not the time to start fixing the gsettings
paths of all packages. This avoids tons of spewage from the gsettings
trigger during package installation.

Added:
    desktop/unstable/glib2.0/debian/patches/revert_schema_path_warning.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=34615&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Thu Apr 26 21:13:11 2012
@@ -4,6 +4,11 @@
   * Refresh patches.
   * debian/patches/git_powerpc_gresources.patch: Upstream fix for gresource on
     big endian architectures, i.e powerpc. Closes: #669130
+  * debian/patches/revert_schema_path_warning.patch: Revert upstream commit
+    which generates a warning for applications using a non-recommended
+    gsettings path. Final freeze is not the time to start fixing the gsettings
+    paths of all packages. This avoids tons of spewage from the gsettings
+    trigger during package installation.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 26 Apr 2012 23:03:59 +0200
 

Added: desktop/unstable/glib2.0/debian/patches/revert_schema_path_warning.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/revert_schema_path_warning.patch?rev=34615&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/revert_schema_path_warning.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/revert_schema_path_warning.patch [utf-8] Thu Apr 26 21:13:11 2012
@@ -1,0 +1,20 @@
+Description: Revert http://git.gnome.org/browse/glib/commit/?id=6560b3. Final freeze is not the time to start fixing the gsettings paths of all packages.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+
+Index: glib2.0-2.32.1/gio/glib-compile-schemas.c
+===================================================================
+--- glib2.0-2.32.1.orig/gio/glib-compile-schemas.c	2012-04-13 15:39:41.000000000 +0200
++++ glib2.0-2.32.1/gio/glib-compile-schemas.c	2012-04-16 15:18:07.121852684 +0200
+@@ -1204,12 +1204,6 @@
+       return;
+     }
+ 
+-  if (path && (g_str_has_prefix (path, "/apps/") ||
+-               g_str_has_prefix (path, "/desktop/") ||
+-               g_str_has_prefix (path, "/system/")))
+-    g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
+-                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
+-
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
+ 

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=34615&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Thu Apr 26 21:13:11 2012
@@ -7,3 +7,4 @@
 61_glib-compile-binaries-path.patch
 90-gio-modules-multiarch-compat.patch
 git_powerpc_gresources.patch
+revert_schema_path_warning.patch