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

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Dec 15 13:38:52 2011
New Revision: 32125

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32125
Log:
Reapply r31508

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=32125&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Thu Dec 15 13:38:52 2011
@@ -1,7 +1,16 @@
 glib2.0 (2.30.2-5) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Drop deprecated build-dependencies on pygobject & python-dbus.
   * 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"
 
  -- Josselin Mouette <joss at debian.org>  Thu, 24 Nov 2011 21:12:46 +0100
 

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=32125&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] Thu Dec 15 13:38:52 2011
@@ -17,7 +17,17 @@
             # This is triggered everytime an application installs a GIO
             # module into /usr/lib/#MULTIARCH#/gio/modules or the
             # backwards-compatible /usr/lib/gio/modules directory
-            /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules /usr/lib/gio/modules
+
+            # 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
+            fi
             ;;
         esac
     done