r36566 - in /desktop/experimental/glib2.0: ./ debian/changelog debian/libglib2.0-0.postrm.in

[laney at users.alioth.debian.org]

Author: laney
Date: Fri Jan 11 11:31:26 2013
New Revision: 36566

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36566
Log:
* Merges from unstable branch (Michael Biebl)
  - 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/experimental/glib2.0/   (props changed)
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in

Propchange: desktop/experimental/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 11 11:31:26 2013
@@ -1,1 +1,1 @@
-/desktop/unstable/glib2.0:24636,27515-27547
+/desktop/unstable/glib2.0:24636,27515-27547,36542,36550,36556

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=36566&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Jan 11 11:31:26 2013
@@ -1,10 +1,17 @@
-glib2.0 (2.35.3-1) UNRELEASED; urgency=low
+glib2.0 (2.33.12+really2.32.4-3) unstable; urgency=low
 
   [ Matthias Klose ]
   * Configure cross builds with --disable-modular-tests --disable-gtk-doc.
 
   [ Iain Lane ]
-  * New upstream release 2.35.1 
+  * New upstream release 2.35.3 
+  * Merges from unstable branch (Michael Biebl)
+    - 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)
 
  -- Iain Lane <laney at debian.org>  Thu, 10 Jan 2013 13:00:54 +0000
 

Modified: desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in?rev=36566&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in [utf-8] Fri Jan 11 11:31:26 2013
@@ -10,12 +10,22 @@
 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
+
+    # With multiarch enabled we can't be certain that the cache file
+    # isn't needed for other architectures since it is not reference
+    # counted. The best we can do is to fire a file trigger which will
+    # regenerate the cache file if required.
+    if [ -d /usr/share/glib-2.0/schemas ]; then
+        dpkg-trigger /usr/share/glib-2.0/schemas
+    fi
 fi