r29155 - in /desktop/unstable/gtk+2.0/debian: changelog libgtk2.0-0.postinst.in

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Jul 28 13:42:47 UTC 2011


Author: biebl
Date: Thu Jul 28 13:42:47 2011
New Revision: 29155

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29155
Log:
debian/libgtk2.0-0.postinst.in: If the non-multiarch immodules directory
does not exist or is empty handle this case more gracefully and don't
print an error message.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=29155&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Thu Jul 28 13:42:47 2011
@@ -22,6 +22,9 @@
   [ Michael Biebl ]
   * debian/libgtk2.0-dev.install.in: Stop installing libtool .la files.
   * debian/rules: Stop cleaning the dependency_libs in the *.la files.
+  * debian/libgtk2.0-0.postinst.in: If the non-multiarch immodules directory
+    does not exist or is empty handle this case more gracefully and don't
+    print an error message.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 22 Jul 2011 23:07:18 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.postinst.in?rev=29155&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] Thu Jul 28 13:42:47 2011
@@ -1,5 +1,8 @@
 #!/bin/sh
 set -e
+
+IMMODULES_DIR=/@MODULES_BASE_PATH@/immodules
+IMMODULES_DIR_OLD=/@OLD_MODULES_BASE_PATH@/immodules
 
 if [ "$1" = triggered ]; then
     for trigger in $2; do
@@ -7,12 +10,11 @@
             continue
         fi
         case $trigger in
-          /@MODULES_BASE_PATH@/immodules|/@OLD_MODULES_BASE_PATH@/immodules)
+          $IMMODULES_DIR|$IMMODULES_DIR_OLD)
             # This is triggered everytime an application installs a
             # GTK immodule loader
             /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 \
-                /@MODULES_BASE_PATH@/immodules/*.so \
-                /@OLD_MODULES_BASE_PATH@/immodules/*.so \
+                $(find $IMMODULES_DIR $IMMODULES_DIR_OLD -name *.so 2> /dev/null) \
             > /@MODULES_BASE_PATH@/gtk.immodules || true
             ;;
         esac
@@ -23,12 +25,10 @@
 #DEBHELPER#
 
 # Also handle the initial installation
-if [ -d /@MODULES_BASE_PATH@/immodules ] \
-   || [ -d /@OLD_MODULES_BASE_PATH@/immodules ]
+if [ -d $IMMODULES_DIR ] || [ -d $IMMODULES_DIR_OLD ]; then
 then
      /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 \
-         /@MODULES_BASE_PATH@/immodules/*.so \
-         /@OLD_MODULES_BASE_PATH@/immodules/*.so \
+         $(find $IMMODULES_DIR $IMMODULES_DIR_OLD -name *.so 2> /dev/null) \
      > /@MODULES_BASE_PATH@/gtk.immodules || true
 fi
 




More information about the pkg-gnome-commits mailing list