r34058 - in /desktop/unstable/glib2.0/debian: changelog patches/90-gio-modules-multiarch-compat.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Apr  3 09:31:44 2012
New Revision: 34058

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34058
Log:
revert previous commit; compat patch is preferred over explicit Breaks:

Added:
    desktop/unstable/glib2.0/debian/patches/90-gio-modules-multiarch-compat.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=34058&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Tue Apr  3 09:31:44 2012
@@ -1,13 +1,8 @@
 glib2.0 (2.32.0-4) UNRELEASED; urgency=low
 
-  [ Michael Biebl ]
   * Set --sourcedir for the different flavors when running dh_install. This
     way the .install files can be simplified a lot which makes them much more
     readable.
-
-  [ Martin Pitt ]
-  * Drop 90-gio-modules-multiarch-compat.patch. There are no packages shipping
-    gio modules in the old /usr/lib/gio/ path any more.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 31 Mar 2012 00:53:47 +0200
 

Added: desktop/unstable/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch?rev=34058&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch [utf-8] Tue Apr  3 09:31:44 2012
@@ -1,0 +1,13 @@
+Index: glib2.0/gio/giomodule.c
+===================================================================
+--- glib2.0.orig/gio/giomodule.c	2012-02-20 18:23:17.000000000 -0200
++++ glib2.0/gio/giomodule.c	2012-03-02 19:35:43.469165001 -0300
+@@ -899,6 +899,8 @@
+ 
+       /* Then load the compiled in path */
+       g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);
++      /* Hard-coded fallback directory for pre-multiarch compatibility */
++      g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
+ 
+       g_io_module_scope_free (scope);
+ 

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=34058&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Tue Apr  3 09:31:44 2012
@@ -5,3 +5,4 @@
 04_homedir_env.patch
 #10-add-a-forgotten-include-guard.patch
 61_glib-compile-binaries-path.patch
+90-gio-modules-multiarch-compat.patch