r32414 - in /desktop/unstable/glib2.0/debian: changelog libglib2.0-0.postinst.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jan 18 12:49:25 2012
New Revision: 32414

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32414
Log:
The /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules directory should be
guaranteed to exist so don't suppress any error messages by skipping that
directory until we know better what the underlying problem is.

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=32414&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Wed Jan 18 12:49:25 2012
@@ -5,19 +5,13 @@
   * Retain one on python for the script that uses it.
 
   [ Loïc Minier ]
-  * Avoid harmless warning when running
-    "/usr/lib/i386-linux-gnu/glib-2.0/gio-querymodules
-    /usr/lib/i386-linux-gnu/gio/modules /usr/lib/gio/modules" on an amd64
-    system without /usr/lib/i386-linux-gnu/gio/modules: "Unable to open
-    directory /usr/lib/i386-linux-gnu/gio/modules: Error opening directory
-    '/usr/lib/i386-linux-gnu/gio/modules': No such file or directory" or when
-    processing triggers of libglib2.0-0:i386 and libglib2.0-0 on an amd64
-    system ("Unable to open directory /usr/lib/gio/modules: Error opening
+  * Avoid harmless warnings when processing triggers of libglib2.0-0
+    ("Unable to open directory /usr/lib/gio/modules: Error opening
     directory '/usr/lib/gio/modules': No such file or directory").
 
   [ Michael Biebl ]
   * Cherry-pick patches from upstream Git which fix handling of ENUMs and
-    integral return types on 64-bit BE platforms.Closes: #653308
+    integral return types on 64-bit BE platforms. Closes: #653308
     - Add d/p/94-closure-fix-handling-of-ENUMs-and-integral-return-ty.patch.
     - Add d/p/93-gvalue-Add-explicitly-signed-g_value_get_schar-and-g.patch.
     - Update symbols file accordingly.

Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in?rev=32414&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in [utf-8] Wed Jan 18 12:49:25 2012
@@ -18,16 +18,14 @@
             # module into /usr/lib/#MULTIARCH#/gio/modules or the
             # backwards-compatible /usr/lib/gio/modules directory
 
-            # check which directories actually exist
-            dirs=""
-            for dir in /usr/lib/#MULTIARCH#/gio/modules /usr/lib/gio/modules; do
-                if [ -d "$dir" ]; then
-                    dirs="$dirs $dir"
-                fi
-            done
-            if [ -n "$dirs" ]; then
-                /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules $dirs
+            # The /usr/lib/gio/modules directory is no longer shipped by
+            # libglib2.0 itself so we need to check to avoid a warning from
+            # gio-querymodules
+            dirs=/usr/lib/#MULTIARCH#/gio/modules
+            if [ -d /usr/lib/gio/modules ]; then
+                dirs="$dirs /usr/lib/gio/modules"
             fi
+            /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules $dirs
             ;;
         esac
     done