r28895 - in /desktop/unstable/gdk-pixbuf/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Jul 15 22:00:27 UTC 2011
Author: biebl
Date: Fri Jul 15 22:00:26 2011
New Revision: 28895
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28895
Log:
Multiarch support. (Closes: #632354)
Added:
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install.in
- copied, changed from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in
- copied, changed from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm.in
- copied, changed from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers.in
- copied, changed from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links.in
- copied, changed from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links
Removed:
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links
desktop/unstable/gdk-pixbuf/debian/patches/041_ia32-libs.patch
Modified:
desktop/unstable/gdk-pixbuf/debian/changelog
desktop/unstable/gdk-pixbuf/debian/control
desktop/unstable/gdk-pixbuf/debian/control.in
desktop/unstable/gdk-pixbuf/debian/gir1.2-gdkpixbuf-2.0.install
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0-udeb.install
desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.install
desktop/unstable/gdk-pixbuf/debian/patches/series
desktop/unstable/gdk-pixbuf/debian/rules
Modified: desktop/unstable/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/changelog?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/changelog [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,3 +1,10 @@
+gdk-pixbuf (2.23.5-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Multiarch support. (Closes: #632354)
+
+ -- Michael Biebl <biebl at debian.org> Fri, 15 Jul 2011 23:58:51 +0200
+
gdk-pixbuf (2.23.5-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/gdk-pixbuf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control [utf-8] Fri Jul 15 22:00:26 2011
@@ -8,8 +8,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.90~),
- debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+ debhelper (>= 8.1.3),
autotools-dev,
gnome-pkg-tools (>= 0.10),
libglib2.0-dev (>= 2.27.2),
@@ -37,6 +37,8 @@
libwmf0.2-7 (<< 0.2.8.4-7),
librsvg2-2 (<< 2.26.3-2)
Replaces: libgtk2.0-0 (<< 2.21.3), libgtk2.0-bin (<< 2.21.3)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: GDK Pixbuf library
The Gdk Pixbuf library provides:
- Image loading and saving facilities.
Modified: desktop/unstable/gdk-pixbuf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control.in?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control.in [utf-8] Fri Jul 15 22:00:26 2011
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.90~),
- debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+ debhelper (>= 8.1.3),
autotools-dev,
gnome-pkg-tools (>= 0.10),
libglib2.0-dev (>= 2.27.2),
@@ -32,6 +32,8 @@
libwmf0.2-7 (<< 0.2.8.4-7),
librsvg2-2 (<< 2.26.3-2)
Replaces: libgtk2.0-0 (<< 2.21.3), libgtk2.0-bin (<< 2.21.3)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: GDK Pixbuf library
The Gdk Pixbuf library provides:
- Image loading and saving facilities.
Modified: desktop/unstable/gdk-pixbuf/debian/gir1.2-gdkpixbuf-2.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/gir1.2-gdkpixbuf-2.0.install?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/gir1.2-gdkpixbuf-2.0.install [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/gir1.2-gdkpixbuf-2.0.install [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0/* usr/lib/girepository-1.0
Modified: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0-udeb.install?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0-udeb.install [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0-udeb.install [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,3 +1,3 @@
-usr/lib/*.so.*
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
+usr/lib/*/*.so.* usr/lib
+usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
usr/share/locale
Copied: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install.in (from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install.in?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install.in [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,4 +1,4 @@
-usr/bin/gdk-pixbuf-query-loaders /usr/lib/gdk-pixbuf-2.0
-usr/lib/*.so.*
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+usr/bin/gdk-pixbuf-query-loaders /usr/lib/${DEB_HOST_MULTIARCH}/gdk-pixbuf-2.0
+usr/lib/${DEB_HOST_MULTIARCH}/*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/gdk-pixbuf-2.0/2.10.0/loaders/*.so
usr/share/locale
Copied: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in (from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in [utf-8] Fri Jul 15 22:00:26 2011
@@ -7,20 +7,30 @@
continue
fi
case $trigger in
- /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
+ /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders|/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
+ /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
+ /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
+ /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
+ > /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders.cache 2>/dev/null \
+ || 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
+if [ -d /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders ] \
+ || [ -d /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders ]
+then
+ /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
+ /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
+ /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
+ > /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders.cache 2>/dev/null \
+ || true
fi
-
Copied: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm.in (from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm.in?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postrm.in [utf-8] Fri Jul 15 22:00:26 2011
@@ -3,9 +3,9 @@
#DEBHELPER#
-if [ -d /usr/lib/gdk-pixbuf-2.0/2.10.0 ]; then
+if [ -d /usr/lib/#MULTIARCH#/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
+ rm -f /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders.cache
+ rmdir -p --ignore-fail-on-non-empty /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0
fi
Copied: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers.in (from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers.in?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.triggers.in [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,1 +1,2 @@
interest /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
+interest /usr/lib/${DEB_HOST_MULTIARCH}/gdk-pixbuf-2.0/2.10.0/loaders
Modified: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.install?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.install [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.install [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,8 +1,8 @@
usr/bin/gdk-pixbuf-csource
usr/include
-usr/lib/*.so
+usr/lib/*/*.so
usr/lib/*.la
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
usr/share/gir-1.0
usr/share/man/man1
usr/share/gir-1.0
Copied: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links.in (from r28894, desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links.in?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.links.in [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,1 +1,1 @@
-/usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders /usr/bin/gdk-pixbuf-query-loaders
+/usr/lib/${DEB_HOST_MULTIARCH}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders /usr/bin/gdk-pixbuf-query-loaders
Modified: desktop/unstable/gdk-pixbuf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/patches/series?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/patches/series [utf-8] Fri Jul 15 22:00:26 2011
@@ -1,1 +1,0 @@
-041_ia32-libs.patch
Modified: desktop/unstable/gdk-pixbuf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/rules?rev=28895&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/rules [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/rules [utf-8] Fri Jul 15 22:00:26 2011
@@ -4,19 +4,35 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
DEB_MAKE_CHECK_TARGET = check
-DEB_CONFIGURE_EXTRA_FLAGS := --with-libjasper --enable-introspection
-DEB_DH_MAKESHLIBS_ARGS_libgdk-pixbuf2.0-0 += --add-udeb=libgdk-pixbuf2.0-0-udeb -X "/usr/lib/gdk-pixbuf-2.0" -V -- -c4
+DEB_CONFIGURE_EXTRA_FLAGS := --with-libjasper --enable-introspection \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
+DEB_DH_MAKESHLIBS_ARGS_libgdk-pixbuf2.0-0 += --add-udeb=libgdk-pixbuf2.0-0-udeb -X "/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0" -V -- -c4
common-binary-fixup-arch::
- mkdir -p debian/libgdk-pixbuf2.0-0-udeb/usr/lib/gdk-pixbuf-2.0/2.10.0
+ mkdir -p debian/libgdk-pixbuf2.0-0-udeb/usr/lib/$(DEB_HOST_MULTIARCH)/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/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 \
+ debian/libgdk-pixbuf2.0-0/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
+ debian/libgdk-pixbuf2.0-0-udeb/usr/lib/$(DEB_HOST_MULTIARCH)/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/loaders.cache
+ > debian/libgdk-pixbuf2.0-0-udeb/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0/2.10.0/loaders.cache
+
+binary-install/libgdk-pixbuf2.0-0::
+ for script in postinst postrm; do \
+ sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
+ debian/$(cdbs_curpkg).$$script.in \
+ > debian/$(cdbs_curpkg).$$script ; \
+ done
+
+common-install-arch::
+ for file in libgdk-pixbuf2.0-0.install libgdk-pixbuf2.0-dev.links \
+ libgdk-pixbuf2.0-0.triggers; \
+ do \
+ sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
+ debian/$${file}.in > debian/$$file; \
+ done
# temporary directory for the minimal MIME cache generation
mimedir = debian/build-mime
More information about the pkg-gnome-commits
mailing list