r31054 - in /desktop/unstable/librsvg/debian: changelog librsvg2-common.postinst.in

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Oct 26 10:42:59 2011
New Revision: 31054

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31054
Log:
debian/librsvg2-common.postinst.in: Simplify by merely activating the
triggers of interested packages again instead of copy&paste'ing the
gdk-pixbuf-loader code snippets. Also add a more detailled comment about
why this is necessary. Also fix the glob to only catch directories.
(Closes: #640955)

Modified:
    desktop/unstable/librsvg/debian/changelog
    desktop/unstable/librsvg/debian/librsvg2-common.postinst.in

Modified: desktop/unstable/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/changelog?rev=31054&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog [utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog [utf-8] Wed Oct 26 10:42:59 2011
@@ -1,3 +1,13 @@
+librsvg (2.34.1-3) UNRELEASED; urgency=low
+
+  * debian/librsvg2-common.postinst.in: Simplify by merely activating the
+    triggers of interested packages again instead of copy&paste'ing the
+    gdk-pixbuf-loader code snippets. Also add a more detailled comment about
+    why this is necessary. Also fix the glob to only catch directories.
+    (Closes: #640955)
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 26 Oct 2011 12:40:06 +0200
+
 librsvg (2.34.1-2) unstable; urgency=low
 
   * debian/control.in: Add libgtk-3-dev build dependency to also build the

Modified: desktop/unstable/librsvg/debian/librsvg2-common.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/librsvg2-common.postinst.in?rev=31054&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/librsvg2-common.postinst.in [utf-8] (original)
+++ desktop/unstable/librsvg/debian/librsvg2-common.postinst.in [utf-8] Wed Oct 26 10:42:59 2011
@@ -4,13 +4,12 @@
 #DEBHELPER#
 
 if [ "$1" = configure ]; then
-    # run an update there because the trigger might not work; see
+    # gdk-pixbuf's triggers already trigger on "interest" which happens after
+    # unpack. At that time the SVG loader might not work yet due to
+    # unconfigured/missing dependencies, so we need to run the gdk pixbuf
+    # loader query again after we are configured, as that is the only time when
+    # our library is guaranteed to work. see #
     # https://launchpad.net/bugs/719861 comment 9 for details
-    GDKPIXDIR=/usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/
-    if [ -d $GDKPIXDIR ]; then
-        for VERSION in  `ls $GDKPIXDIR`; do
-	    $GDKPIXDIR/gdk-pixbuf-query-loaders $GDKPIXDIR/$VERSION/loaders/*.so /usr/lib/gdk-pixbuf-2.0/$VERSION/loaders/*.so > $GDKPIXDIR/$VERSION/loaders.cache 2>/dev/null || true
-	done
-    fi
+    dpkg-trigger --no-await /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/*/loaders
 fi