r36542 - in /desktop/unstable/glib2.0/debian: changelog libglib2.0-0.postrm.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jan  8 06:58:35 2013
New Revision: 36542

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36542
Log:
Take into account multiarch when removing the cache files in postrm:
Remove /usr/lib/gio/modules/giomodule.cache only for the native
architecture for which this cache file was created.
After removing /usr/share/glib-2.0/schemas/gschemas.compiled on purge,
run dpkg-trigger explicitly, so in case libglib2.0-0 is installed for
other architectures, the cache file is re-created. (Closes: #696389)

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

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=36542&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Tue Jan  8 06:58:35 2013
@@ -1,3 +1,14 @@
+glib2.0 (2.33.12+really2.32.4-4) UNRELEASED; urgency=low
+
+  * Take into account multiarch when removing the cache files in postrm:
+    Remove /usr/lib/gio/modules/giomodule.cache only for the native
+    architecture for which this cache file was created.
+    After removing /usr/share/glib-2.0/schemas/gschemas.compiled on purge,
+    run dpkg-trigger explicitly, so in case libglib2.0-0 is installed for
+    other architectures, the cache file is re-created. (Closes: #696389)
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 08 Jan 2013 07:46:19 +0100
+
 glib2.0 (2.33.12+really2.32.4-3) unstable; urgency=low
 
   * Team upload

Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.postrm.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.postrm.in?rev=36542&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.postrm.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.postrm.in [utf-8] Tue Jan  8 06:58:35 2013
@@ -10,12 +10,15 @@
 fi
 if [ -d /usr/lib/gio/modules ]; then
     # Purge the cache
-    rm -f /usr/lib/gio/modules/giomodule.cache
-    rmdir -p --ignore-fail-on-non-empty /usr/lib/gio/modules
+    if [ $(dpkg --print-architecture) = #ARCH# ]; then
+        rm -f /usr/lib/gio/modules/giomodule.cache
+        rmdir -p --ignore-fail-on-non-empty /usr/lib/gio/modules
+    fi
 fi
 
 if [ "$1" = purge ] && [ -d /usr/share/glib-2.0/schemas ]; then
     # Purge the compiled schemas
     rm -f /usr/share/glib-2.0/schemas/gschemas.compiled
     rmdir -p --ignore-fail-on-non-empty /usr/share/glib-2.0/schemas
+    [ -d /usr/share/glib-2.0/schemas ] && dpkg-trigger /usr/share/glib-2.0/schemas
 fi