r24850 - in /desktop/experimental/gdk-pixbuf/debian: ./ patches/

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Thu Jul 22 13:36:32 UTC 2010 

Author: slomo
Date: Thu Jul 22 13:36:31 2010
New Revision: 24850

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24850
Log:
  + Generate loader files for the udeb.
* debian/libgdk-pixbuf2.0-0.triggers,
  debian/libgdk-pixbuf2.0-0.postinst,
  debian/libgdk-pixbuf2.0-0.postrm:
  + Use triggers for the pixbuf loaders.
* debian/libgdk-pixbuf2.0-0.install,
  debian/libgdk-pixbuf2.0-dev.links:
  + Put gdk-pixbuf-query-loaders into a versioned directory
    and put a link to it for /usr/bin into the -dev package.

Added:
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links
Removed:
    desktop/experimental/gdk-pixbuf/debian/patches/021_loader-files-d.patch
    desktop/experimental/gdk-pixbuf/debian/patches/022_module-files-append-compat-module-files-d.patch
    desktop/experimental/gdk-pixbuf/debian/patches/099_autoreconf.patch
Modified:
    desktop/experimental/gdk-pixbuf/debian/changelog
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install
    desktop/experimental/gdk-pixbuf/debian/patches/series
    desktop/experimental/gdk-pixbuf/debian/rules

Modified: desktop/experimental/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/changelog?rev=24850&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] Thu Jul 22 13:36:31 2010
@@ -12,8 +12,6 @@
     + Add symbols file and pass correct parameters to dh_makeshlibs.
   * debian/copyright:
     + Update with all copyright holders.
-  * debian/patches/99_autoreconf.patch:
-    + Regenerate autoconf/automake files for our patches.
   * debian/control.in,
     debian/rules,
     debian/libgdk-pixbuf2.0-0-udeb.install:
@@ -21,6 +19,14 @@
   * debian/rules:
     + Enable libjasper JPEG2000 loader.
   * debian/rules:
-    + Generate loader files.
+    + Generate loader files for the udeb.
+  * debian/libgdk-pixbuf2.0-0.triggers,
+    debian/libgdk-pixbuf2.0-0.postinst,
+    debian/libgdk-pixbuf2.0-0.postrm:
+    + Use triggers for the pixbuf loaders.
+  * debian/libgdk-pixbuf2.0-0.install,
+    debian/libgdk-pixbuf2.0-dev.links:
+    + Put gdk-pixbuf-query-loaders into a versioned directory
+      and put a link to it for /usr/bin into the -dev package.
 
- -- Sebastian Dröge <slomo at debian.org>  Thu, 22 Jul 2010 13:41:13 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 22 Jul 2010 15:32:57 +0200

Modified: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install?rev=24850&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install [utf-8] Thu Jul 22 13:36:31 2010
@@ -1,4 +1,4 @@
-debian/tmp/usr/bin/gdk-pixbuf-query-loaders
+debian/tmp/usr/bin/gdk-pixbuf-query-loaders /usr/lib/gdk-pixbuf-2.0
 debian/tmp/usr/lib/*.so.*
 debian/tmp/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so
 debian/tmp/usr/share/locale

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst?rev=24850&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst [utf-8] Thu Jul 22 13:36:31 2010
@@ -1,0 +1,26 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = triggered ]; then
+    for trigger in $2; do
+        if ! [ -d $trigger ]; then
+            continue
+        fi
+        case $trigger in
+          /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
+            # This is triggered everytime an application installs a
+            # GdkPixbuf loader
+            /usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so > /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache || true
+            ;;
+        esac
+    done
+    exit 0
+fi
+
+#DEBHELPER#
+
+# Also handle the initial installation
+if [ -d /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders ]; then
+    /usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so > /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache || true
+fi
+

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm?rev=24850&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm [utf-8] Thu Jul 22 13:36:31 2010
@@ -1,0 +1,11 @@
+#! /bin/sh
+set -e
+
+#DEBHELPER#
+
+if [ -d /usr/lib/gdk-pixbuf-2.0/2.10.0 ]; then
+    # Purge the cache
+    rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+    rmdir -p --ignore-fail-on-non-empty /usr/lib/gdk-pixbuf-2.0/2.10.0
+fi
+

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers?rev=24850&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers [utf-8] Thu Jul 22 13:36:31 2010
@@ -1,0 +1,1 @@
+interest /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links?rev=24850&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links [utf-8] Thu Jul 22 13:36:31 2010
@@ -1,0 +1,1 @@
+/usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders /usr/bin/gdk-pixbuf-query-loaders

Modified: desktop/experimental/gdk-pixbuf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/patches/series?rev=24850&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/patches/series [utf-8] Thu Jul 22 13:36:31 2010
@@ -1,4 +1,1 @@
-021_loader-files-d.patch
-022_module-files-append-compat-module-files-d.patch
 041_ia32-libs.patch
-099_autoreconf.patch

Modified: desktop/experimental/gdk-pixbuf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/rules?rev=24850&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/rules [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/rules [utf-8] Thu Jul 22 13:36:31 2010
@@ -9,15 +9,9 @@
 DEB_DH_MAKESHLIBS_ARGS_libgdk-pixbuf2.0-0 += --add-udeb=libgdk-pixbuf2.0-0-udeb -X "/usr/lib/gdk-pixbuf-2.0" -V "libgdk-pixbuf2.0-0 (>= 2.21.6)" -- -c4
 
 common-binary-fixup-arch::
-	mkdir -p debian/libgdk-pixbuf2.0-0/usr/lib/gdk-pixbuf-2.0/2.10.0/loader-files.d
-	LD_LIBRARY_PATH=debian/libgdk-pixbuf2.0-0/usr/lib:$(LD_LIBRARY_PATH) \
-		debian/libgdk-pixbuf2.0-0/usr/bin/gdk-pixbuf-query-loaders \
-		debian/libgdk-pixbuf2.0-0/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
-		| sed 's;$(CURDIR)/debian/libgdk-pixbuf2.0-0;;g' \
-		> debian/libgdk-pixbuf2.0-0/usr/lib/gdk-pixbuf-2.0/2.10.0/loader-files.d/libgdk-pixbuf2.0-0.loaders
-	mkdir -p debian/libgdk-pixbuf2.0-0-udeb/usr/lib/gdk-pixbuf-2.0/2.10.0/loader-files.d
+	mkdir -p debian/libgdk-pixbuf2.0-0-udeb/usr/lib/gdk-pixbuf-2.0/2.10.0
 	LD_LIBRARY_PATH=debian/libgdk-pixbuf2.0-0-udeb/usr/lib:$(LD_LIBRARY_PATH) \
-		debian/libgdk-pixbuf2.0-0/usr/bin/gdk-pixbuf-query-loaders \
+		debian/libgdk-pixbuf2.0-0/usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
 		debian/libgdk-pixbuf2.0-0-udeb/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
 		| sed 's;$(CURDIR)/debian/libgdk-pixbuf2.0-0-udeb;;g' \
-		> debian/libgdk-pixbuf2.0-0-udeb/usr/lib/gdk-pixbuf-2.0/2.10.0/loader-files.d/libgdk-pixbuf2.0-0.loaders
+		> debian/libgdk-pixbuf2.0-0-udeb/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache

More information about the pkg-gnome-commits mailing list