r35705 - in /desktop/experimental/glib2.0/debian: changelog control patches/03_disble_glib_compile_schemas_warning.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Mon Sep 10 15:56:17 2012
New Revision: 35705

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35705
Log:
debian/patches/03_disble_glib_compile_schemas_warning.patch: Add a new
patch to disable a warning when compiling schemas which are installed into
'deprecated' locations. Users see this very often due to
glib-compile-schemas being called from libglib2.0-0's trigger and it is
not very useful for them.

Added:
    desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35705&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Mon Sep 10 15:56:17 2012
@@ -1,3 +1,13 @@
+glib2.0 (2.33.12-4) UNRELEASED; urgency=low
+
+  * debian/patches/03_disble_glib_compile_schemas_warning.patch: Add a new
+    patch to disable a warning when compiling schemas which are installed into
+    'deprecated' locations. Users see this very often due to
+    glib-compile-schemas being called from libglib2.0-0's trigger and it is
+    not very useful for them.
+
+ -- Iain Lane <laney at debian.org>  Mon, 10 Sep 2012 16:25:18 +0100
+
 glib2.0 (2.33.12-3) experimental; urgency=low
 
   * debian/control.in: Add Breaks: too glib-networking versions prior to

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=35705&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Mon Sep 10 15:56:17 2012
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Martin Pitt <mpitt at debian.org>
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93),
                dh-autoreconf,

Added: desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch?rev=35705&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch [utf-8] Mon Sep 10 15:56:17 2012
@@ -1,0 +1,24 @@
+Description: Disable confusing (to users) warning about deprecated schema paths
+Author: Iain Lane <iain.lane at canonical.com>
+Forwarded: not-needed
+
+Index: b/gio/glib-compile-schemas.c
+===================================================================
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1204,11 +1204,13 @@
+       return;
+     }
+ 
+-  if (path && (g_str_has_prefix (path, "/apps/") ||
++// Disable this warning: it confuses users and there is unlikely to be much
++// progress towards fixing
++/*  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);
++                "'/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/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35705&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Mon Sep 10 15:56:17 2012
@@ -1,5 +1,6 @@
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
+03_disble_glib_compile_schemas_warning.patch
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch