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

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Feb 16 13:00:12 2012
New Revision: 32614

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32614
Log:
  + Only run gio-querymodules on the non-multiarch path for the host 
    architecture.
* rules: add substitution for #ARCH# for the above change.

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

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=32614&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Thu Feb 16 13:00:12 2012
@@ -3,8 +3,9 @@
   * libglib2.0-0.posinst.in:
     + Encapsulate gio-querymodules calls in || true statements.
       Closes: #659588.
-    + Only run gio-querymodules on the non-multiarch path and 
-      glib-compile-schemas for the host architecture.
+    + Only run gio-querymodules on the non-multiarch path for the host 
+      architecture.
+  * rules: add substitution for #ARCH# for the above change.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 16 Feb 2012 12:21:51 +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=32614&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 Feb 16 13:00:12 2012
@@ -10,10 +10,7 @@
           /usr/share/glib-2.0/schemas)
             # This is triggered everytime an application installs a
             # GSettings schema
-            # Only do this once, using the host installation.
-            if [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
-              /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
-            fi
+            /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
             ;;
 
           /usr/lib/#MULTIARCH#/gio/modules|/usr/lib/gio/modules)
@@ -25,7 +22,7 @@
             # 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 ] && [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
+            if [ -d /usr/lib/gio/modules ] && [ $(dpkg --print-architecture) = #ARCH# ]; then
                 dirs="$dirs /usr/lib/gio/modules"
             fi
             /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules $dirs || true
@@ -38,12 +35,12 @@
 #DEBHELPER#
 
 # Also handle the initial installation
-if [ -d /usr/share/glib-2.0/schemas ] && [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
+if [ -d /usr/share/glib-2.0/schemas ]; then
     /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
 fi
 if [ -d /usr/lib/#MULTIARCH#/gio/modules ]; then
     /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules || true
 fi
-if [ -d /usr/lib/gio/modules ] && [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
+if [ -d /usr/lib/gio/modules ] && [ $(dpkg --print-architecture) = #ARCH# ]; then
     /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/gio/modules || true
 fi

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=32614&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Thu Feb 16 13:00:12 2012
@@ -72,6 +72,7 @@
 binary-install/libglib2.0-0::
 	set -e; for script in postinst postrm; do \
 		sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
+		    -e"s/#ARCH#/$(DEB_HOST_ARCH)/g" \
 		    debian/$(cdbs_curpkg).$$script.in \
 		    > debian/$(cdbs_curpkg).$$script ; \
 	done