Simplify our trigger for gtk-query-immodules-3.0, use the --update-cache

option instead of redirecting stdout.
This commit is contained in:
Michael Biebl 2013-07-05 22:48:04 +00:00
parent 605df2d873
commit 017d6a9af1
2 changed files with 11 additions and 17 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
gtk+3.0 (3.8.2-3) UNRELEASED; urgency=low
* Simplify our trigger for gtk-query-immodules-3.0, use the --update-cache
option instead of redirecting stdout.
-- Michael Biebl <biebl@debian.org> Sat, 06 Jul 2013 00:46:34 +0200
gtk+3.0 (3.8.2-2) unstable; urgency=low
* debian/patches/031_ia64_children_test.patch:

View File

@ -5,20 +5,9 @@ IMMODULES_DIR=/@MODULES_BASE_PATH@/immodules
IMMODULES_DIR_OLD=/@OLD_MODULES_BASE_PATH@/immodules
if [ "$1" = triggered ]; then
for trigger in $2; do
if ! [ -d $trigger ]; then
continue
fi
case $trigger in
$IMMODULES_DIR|$IMMODULES_DIR_OLD)
# This is triggered everytime an application installs a
# GTK immodule loader
/@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 \
$(find $IMMODULES_DIR $IMMODULES_DIR_OLD -name *.so 2> /dev/null) \
> /@MODULES_BASE_PATH@/immodules.cache || true
;;
esac
done
# This is triggered everytime an application installs a
# GTK immodule loader
/@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 --update-cache || true
exit 0
fi
@ -26,8 +15,6 @@ fi
# Also handle the initial installation
if [ -d $IMMODULES_DIR ] || [ -d $IMMODULES_DIR_OLD ]; then
/@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 \
$(find $IMMODULES_DIR $IMMODULES_DIR_OLD -name *.so 2> /dev/null) \
> /@MODULES_BASE_PATH@/immodules.cache || true
/@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 --update-cache || true
fi