Source: glib2.0 Version: 2.28.6-2 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: ubuntu-patch oneiric origin-ubuntu
Hi folks, Please find attached a patch to glib2.0 to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been applied and is being used successfully in Ubuntu 11.04, and should be safe to apply in Debian now that multiarch has been bootstrapped there. I think most of the changes are probably self-explanatory from the diff. The only thing I would draw attention to is this change in debian/rules: -DEB_DH_STRIP_ARGS_$(UDEB_PKG) = --dbg-package= +DEB_DH_STRIP_ARGS_$(UDEB_PKG) = This is needed for compatibility with debhelper 7; where compat level 5 ignores the null --dbg-package argument, debhelper 7 does something very unhelpful instead (I forget exactly what). If you have any questions about the patch, please ask! -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== added file 'debian/clean'
--- debian/clean 1970-01-01 00:00:00 +0000
+++ debian/clean 2011-07-16 05:04:38 +0000
@@ -0,0 +1,11 @@
+debian/libgio-fam.install
+debian/libglib2.0-0.install
+debian/libglib2.0-0-refdbg.install
+debian/libglib2.0-dbg.install
+debian/libglib2.0-dev.install
+debian/libglib2.0-bin.links
+debian/libglib2.0-dev.links
+debian/libglib2.0-0.dirs
+debian/libglib2.0-0.triggers
+debian/libglib2.0-0.postinst
+debian/libglib2.0-0.postrm
=== modified file 'debian/compat'
--- debian/compat 2007-03-07 21:56:37 +0000
+++ debian/compat 2011-07-16 00:48:52 +0000
@@ -1,1 +1,1 @@
-5
+7
=== modified file 'debian/control'
--- debian/control 2011-05-31 21:16:39 +0000
+++ debian/control 2011-07-16 01:12:24 +0000
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Loic Minier <l...@dooz.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>, Emilio Pozuelo Monfort <po...@debian.org>, Josselin Mouette <j...@debian.org>, Sebastian Dröge <sl...@debian.org>, Sjoerd Simons <sjo...@debian.org>
-Build-Depends: debhelper (>> 5.0.22),
- cdbs (>= 0.4.90),
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93),
dh-autoreconf,
pkg-config (>= 0.16.0),
gettext,
autotools-dev,
gnome-pkg-tools (>= 0.11),
- dpkg-dev (>= 1.14.13),
+ dpkg-dev (>= 1.16.0),
libpcre3-dev (>= 8.11),
desktop-file-utils,
gtk-doc-tools (>= 1.15),
@@ -39,6 +39,8 @@
gnome-session (<< 3.0.0-3),
gdm3 (<< 3.0.3)
Replaces: libglib2.0-dev (<< 2.23.2-2)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GLib library of C routines
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -72,6 +74,7 @@
Conflicts: libglib2.0-0 (<< 2.25.11-2),
Replaces: libglib2.0-0 (<< 2.25.11-2),
libglib2.0-dev (<< 2.25.11-2)
+Multi-Arch: foreign
Description: Programs for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -108,6 +111,7 @@
libglib2.0-0 (= ${binary:Version})
Conflicts: libglib2.0-dbg
Replaces: libglib2.0-dbg
+Multi-Arch: same
Description: Debugging symbols for the GLib libraries
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -120,6 +124,7 @@
Package: libglib2.0-data
Architecture: all
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: Common files for GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -133,6 +138,7 @@
Architecture: all
Depends: ${misc:Depends}
Suggests: devhelp
+Multi-Arch: foreign
Description: Documentation files for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -146,6 +152,7 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: gamin
+Multi-Arch: same
Description: GLib Input, Output and Streaming Library (fam module)
GIO is the input, output and streaming API of GLib. This package
provides a fam file and directory monitoring backend for it.
@@ -157,6 +164,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
libglib2.0-0 (= ${binary:Version})
+Multi-Arch: same
Description: GLib library of C routines - refdbg library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
=== modified file 'debian/control.in'
--- debian/control.in 2011-05-31 21:16:39 +0000
+++ debian/control.in 2011-07-16 00:55:26 +0000
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Loic Minier <l...@dooz.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>> 5.0.22),
- cdbs (>= 0.4.90),
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93),
dh-autoreconf,
pkg-config (>= 0.16.0),
gettext,
autotools-dev,
gnome-pkg-tools (>= 0.11),
- dpkg-dev (>= 1.14.13),
+ dpkg-dev (>= 1.16.0),
libpcre3-dev (>= 8.11),
desktop-file-utils,
gtk-doc-tools (>= 1.15),
@@ -39,6 +39,8 @@
gnome-session (<< 3.0.0-3),
gdm3 (<< 3.0.3)
Replaces: @DEV_PKG@ (<< 2.23.2-2)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GLib library of C routines
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -72,6 +74,7 @@
Conflicts: @SHARED_PKG@ (<< 2.25.11-2),
Replaces: @SHARED_PKG@ (<< 2.25.11-2),
@DEV_PKG@ (<< 2.25.11-2)
+Multi-Arch: foreign
Description: Programs for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -108,6 +111,7 @@
@SHARED_PKG@ (= ${binary:Version})
Conflicts: libglib2.0-dbg
Replaces: libglib2.0-dbg
+Multi-Arch: same
Description: Debugging symbols for the GLib libraries
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -120,6 +124,7 @@
Package: @DATA_PKG@
Architecture: all
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: Common files for GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -133,6 +138,7 @@
Architecture: all
Depends: ${misc:Depends}
Suggests: devhelp
+Multi-Arch: foreign
Description: Documentation files for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -146,6 +152,7 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: gamin
+Multi-Arch: same
Description: GLib Input, Output and Streaming Library (fam module)
GIO is the input, output and streaming API of GLib. This package
provides a fam file and directory monitoring backend for it.
@@ -157,6 +164,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
@SHARED_PKG@ (= ${binary:Version})
+Multi-Arch: same
Description: GLib library of C routines - refdbg library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
=== removed file 'debian/libgio-fam.install'
--- debian/libgio-fam.install 2008-01-21 08:03:01 +0000
+++ debian/libgio-fam.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/install/deb/usr/lib/gio usr/lib
=== added file 'debian/libgio-fam.install.in'
--- debian/libgio-fam.install.in 1970-01-01 00:00:00 +0000
+++ debian/libgio-fam.install.in 2011-07-16 00:48:53 +0000
@@ -0,0 +1,1 @@
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/gio usr/lib/${DEB_HOST_MULTIARCH}
=== removed file 'debian/libglib2.0-0-refdbg.install'
--- debian/libglib2.0-0-refdbg.install 2011-01-04 22:56:39 +0000
+++ debian/libglib2.0-0-refdbg.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/install/refdbg/usr/lib/libgobject*.so* usr/lib/refdbg
=== added file 'debian/libglib2.0-0-refdbg.install.in'
--- debian/libglib2.0-0-refdbg.install.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-0-refdbg.install.in 2011-07-16 00:48:53 +0000
@@ -0,0 +1,1 @@
+debian/install/refdbg/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so* usr/lib/${DEB_HOST_MULTIARCH}/refdbg
=== removed file 'debian/libglib2.0-0.dirs'
--- debian/libglib2.0-0.dirs 2010-07-11 16:55:10 +0000
+++ debian/libglib2.0-0.dirs 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-/usr/lib/gio/modules
-/usr/share/glib-2.0/schemas
=== added file 'debian/libglib2.0-0.dirs.in'
--- debian/libglib2.0-0.dirs.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-0.dirs.in 2011-07-16 00:48:53 +0000
@@ -0,0 +1,2 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
+/usr/share/glib-2.0/schemas
=== removed file 'debian/libglib2.0-0.install'
--- debian/libglib2.0-0.install 2010-07-02 17:57:49 +0000
+++ debian/libglib2.0-0.install 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-debian/install/deb/usr/lib/libglib-*.so.* lib
-debian/install/deb/usr/lib/libg{object,module,thread,io}-*.so.* usr/lib
-debian/install/deb/usr/bin/gio-querymodules usr/lib/glib-2.0
-debian/install/deb/usr/bin/glib-compile-schemas usr/lib/glib-2.0
=== added file 'debian/libglib2.0-0.install.in'
--- debian/libglib2.0-0.install.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-0.install.in 2011-07-16 00:48:53 +0000
@@ -0,0 +1,4 @@
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libglib-*.so.* lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libg{object,module,thread,io}-*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/bin/gio-querymodules usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
+debian/install/deb/usr/bin/glib-compile-schemas usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
=== removed file 'debian/libglib2.0-0.postinst'
--- debian/libglib2.0-0.postinst 2010-07-20 12:45:06 +0000
+++ debian/libglib2.0-0.postinst 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = triggered ]; then
- for trigger in $2; do
- if ! [ -d $trigger ]; then
- continue
- fi
- case $trigger in
- /usr/share/glib-2.0/schemas)
- # This is triggered everytime an application installs a
- # GSettings schema
- /usr/lib/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
- ;;
-
- /usr/lib/gio/modules)
- # This is triggered everytime an application installs a GIO
- # module into /usr/lib/gio/modules
- /usr/lib/glib-2.0/gio-querymodules /usr/lib/gio/modules
- ;;
- esac
- done
- exit 0
-fi
-
-#DEBHELPER#
-
-# Also handle the initial installation
-if [ -d /usr/share/glib-2.0/schemas ]; then
- /usr/lib/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
-fi
-if [ -d /usr/lib/gio/modules ]; then
- /usr/lib/glib-2.0/gio-querymodules /usr/lib/gio/modules
-fi
=== added file 'debian/libglib2.0-0.postinst.in'
--- debian/libglib2.0-0.postinst.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-0.postinst.in 2011-07-16 00:48:53 +0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = triggered ]; then
+ for trigger in $2; do
+ if ! [ -d $trigger ]; then
+ continue
+ fi
+ case $trigger in
+ /usr/share/glib-2.0/schemas)
+ # This is triggered everytime an application installs a
+ # GSettings schema
+ /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
+ ;;
+
+ /usr/lib/#MULTIARCH#/gio/modules|/usr/lib/gio/modules)
+ # This is triggered everytime an application installs a GIO
+ # module into /usr/lib/#MULTIARCH#/gio/modules or the
+ # backwards-compatible /usr/lib/gio/modules directory
+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules /usr/lib/gio/modules
+ ;;
+ esac
+ done
+ exit 0
+fi
+
+#DEBHELPER#
+
+# Also handle the initial installation
+if [ -d /usr/share/glib-2.0/schemas ]; then
+ /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
+fi
+if [ -d /usr/lib/#MULTIARCH#/gio/modules ]; then
+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules
+fi
+if [ -d /usr/lib/gio/modules ]; then
+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/gio/modules
+fi
=== removed file 'debian/libglib2.0-0.postrm'
--- debian/libglib2.0-0.postrm 2010-07-02 17:57:49 +0000
+++ debian/libglib2.0-0.postrm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#! /bin/sh
-set -e
-
-#DEBHELPER#
-
-if [ -d /usr/lib/gio/modules ]; then
- # Purge the cache
- rm -f /usr/lib/gio/modules/giomodule.cache
- rmdir -p --ignore-fail-on-non-empty /usr/lib/gio/modules
-fi
-
-if [ -d /usr/share/glib-2.0/schemas ]; then
- # Purge the compiled schemas
- rm -f /usr/share/glib-2.0/schemas/gschemas.compiled
- rmdir -p --ignore-fail-on-non-empty /usr/share/glib-2.0/schemas
-fi
=== added file 'debian/libglib2.0-0.postrm.in'
--- debian/libglib2.0-0.postrm.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-0.postrm.in 2011-07-16 00:48:53 +0000
@@ -0,0 +1,21 @@
+#! /bin/sh
+set -e
+
+#DEBHELPER#
+
+if [ -d /usr/lib/#MULTIARCH#/gio/modules ]; then
+ # Purge the cache
+ rm -f /usr/lib/#MULTIARCH#/gio/modules/giomodule.cache
+ rmdir -p --ignore-fail-on-non-empty /usr/lib/#MULTIARCH#/gio/modules
+fi
+if [ -d /usr/lib/gio/modules ]; then
+ # Purge the cache
+ rm -f /usr/lib/gio/modules/giomodule.cache
+ rmdir -p --ignore-fail-on-non-empty /usr/lib/gio/modules
+fi
+
+if [ -d /usr/share/glib-2.0/schemas ]; then
+ # Purge the compiled schemas
+ rm -f /usr/share/glib-2.0/schemas/gschemas.compiled
+ rmdir -p --ignore-fail-on-non-empty /usr/share/glib-2.0/schemas
+fi
=== removed file 'debian/libglib2.0-0.triggers'
--- debian/libglib2.0-0.triggers 2010-07-02 17:57:49 +0000
+++ debian/libglib2.0-0.triggers 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-interest /usr/lib/gio/modules
-interest /usr/share/glib-2.0/schemas
=== added file 'debian/libglib2.0-0.triggers.in'
--- debian/libglib2.0-0.triggers.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-0.triggers.in 2011-07-16 00:48:53 +0000
@@ -0,0 +1,3 @@
+interest /usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
+interest /usr/lib/gio/modules
+interest /usr/share/glib-2.0/schemas
=== removed file 'debian/libglib2.0-bin.links'
--- debian/libglib2.0-bin.links 2010-07-13 11:07:32 +0000
+++ debian/libglib2.0-bin.links 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-/usr/lib/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
-/usr/lib/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas
=== added file 'debian/libglib2.0-bin.links.in'
--- debian/libglib2.0-bin.links.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-bin.links.in 2011-07-16 00:48:54 +0000
@@ -0,0 +1,2 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
+/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas
=== removed file 'debian/libglib2.0-dbg.install'
--- debian/libglib2.0-dbg.install 2007-03-07 21:43:27 +0000
+++ debian/libglib2.0-dbg.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/install/deb/usr/lib/debug/lib*.so* usr/lib/debug
=== added file 'debian/libglib2.0-dbg.install.in'
--- debian/libglib2.0-dbg.install.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-dbg.install.in 2011-07-16 00:48:54 +0000
@@ -0,0 +1,1 @@
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/debug/lib*.so* usr/lib/${DEB_HOST_MULTIARCH}/debug
=== removed file 'debian/libglib2.0-dev.install'
--- debian/libglib2.0-dev.install 2010-07-02 17:57:49 +0000
+++ debian/libglib2.0-dev.install 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-debian/install/deb/usr/include/* usr/include
-debian/install/deb/usr/lib/lib*.{la,a} usr/lib
-debian/install/deb/usr/lib/libg{object,module,thread,io}*.so usr/lib
-debian/install/deb/usr/lib/glib-2.0 usr/lib
-debian/install/deb/usr/lib/pkgconfig usr/lib
-debian/install/deb/usr/share/aclocal usr/share
-debian/install/deb/usr/share/glib-2.0/gdb usr/share/glib-2.0
-debian/install/deb/usr/share/glib-2.0/gettext usr/share/glib-2.0
-debian/install/deb/usr/share/glib-2.0/schemas usr/share/glib-2.0
-debian/install/deb/usr/share/man/man1/glib-genmarshal.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/glib-mkenums.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/gobject-query.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/glib-gettextize.1* usr/share/man/man1
-debian/install/deb/usr/bin/glib-genmarshal usr/bin
-debian/install/deb/usr/bin/gobject-query usr/bin
-debian/install/deb/usr/bin/glib-mkenums usr/bin
-debian/install/deb/usr/bin/gtester-report usr/bin
-debian/install/deb/usr/bin/glib-gettextize usr/bin
-debian/install/deb/usr/bin/gtester usr/bin
=== added file 'debian/libglib2.0-dev.install.in'
--- debian/libglib2.0-dev.install.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-dev.install.in 2011-07-16 00:48:54 +0000
@@ -0,0 +1,19 @@
+debian/install/deb/usr/include/* usr/include
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/lib*.{la,a} usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libg{object,module,thread,io}*.so usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0 usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/share/aclocal usr/share
+debian/install/deb/usr/share/glib-2.0/gdb usr/share/glib-2.0
+debian/install/deb/usr/share/glib-2.0/gettext usr/share/glib-2.0
+debian/install/deb/usr/share/glib-2.0/schemas usr/share/glib-2.0
+debian/install/deb/usr/share/man/man1/glib-genmarshal.1* usr/share/man/man1
+debian/install/deb/usr/share/man/man1/glib-mkenums.1* usr/share/man/man1
+debian/install/deb/usr/share/man/man1/gobject-query.1* usr/share/man/man1
+debian/install/deb/usr/share/man/man1/glib-gettextize.1* usr/share/man/man1
+debian/install/deb/usr/bin/glib-genmarshal usr/bin
+debian/install/deb/usr/bin/gobject-query usr/bin
+debian/install/deb/usr/bin/glib-mkenums usr/bin
+debian/install/deb/usr/bin/gtester-report usr/bin
+debian/install/deb/usr/bin/glib-gettextize usr/bin
+debian/install/deb/usr/bin/gtester usr/bin
=== removed file 'debian/libglib2.0-dev.links'
--- debian/libglib2.0-dev.links 2011-01-04 22:43:05 +0000
+++ debian/libglib2.0-dev.links 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-lib/libglib-2.0.so.0 usr/lib/libglib-2.0.so
=== added file 'debian/libglib2.0-dev.links.in'
--- debian/libglib2.0-dev.links.in 1970-01-01 00:00:00 +0000
+++ debian/libglib2.0-dev.links.in 2011-07-16 00:48:54 +0000
@@ -0,0 +1,1 @@
+lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so
=== modified file 'debian/libglib2.0-udeb.install'
--- debian/libglib2.0-udeb.install 2007-03-07 21:43:27 +0000
+++ debian/libglib2.0-udeb.install 2011-07-16 05:04:26 +0000
@@ -1,2 +1,2 @@
-debian/install/udeb/usr/lib/lib*.so.* usr/lib
+debian/install/udeb/usr/lib/*/lib*.so.* usr/lib
debian/install/udeb/usr/share/locale usr/share
=== added file 'debian/patches/gio-modules-multiarch-compat.patch'
--- debian/patches/gio-modules-multiarch-compat.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/gio-modules-multiarch-compat.patch 2011-07-16 00:48:54 +0000
@@ -0,0 +1,13 @@
+Index: glib2.0-2.28.3/gio/giomodule.c
+===================================================================
+--- glib2.0-2.28.3.orig/gio/giomodule.c
++++ glib2.0-2.28.3/gio/giomodule.c
+@@ -584,6 +584,8 @@
+ loaded_dirs = TRUE;
+
+ g_io_modules_scan_all_in_directory (GIO_MODULE_DIR);
++ /* Hard-coded fallback directory for pre-multiarch compatibility */
++ g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
+
+ module_path = g_getenv ("GIO_EXTRA_MODULES");
+
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-04-14 08:36:29 +0000
+++ debian/patches/series 2011-07-16 00:52:42 +0000
@@ -5,3 +5,4 @@
04_homedir_env.patch
60_wait-longer-for-threads-to-die.patch
61_glib-compile-schemas-path.patch
+gio-modules-multiarch-compat.patch
=== modified file 'debian/rules'
--- debian/rules 2011-03-12 22:57:02 +0000
+++ debian/rules 2011-07-16 00:48:55 +0000
@@ -44,13 +44,14 @@
DEB_DH_MAKESHLIBS_ARGS_$(REFDBG_PKG) = --no-act
DEB_DH_STRIP_ARGS_$(REFDBG_PKG) = --no-act
# Don't put the symbols in the -dbg package
-DEB_DH_STRIP_ARGS_$(UDEB_PKG) = --dbg-package=
+DEB_DH_STRIP_ARGS_$(UDEB_PKG) =
DEB_MAKE_CHECK_TARGET = -k check || true
# configure flags
DEB_CONFIGURE_EXTRA_FLAGS := \
--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--with-pcre=system
DEB_CONFIGURE_FLAGS_deb := \
@@ -63,6 +64,26 @@
--disable-Bsymbolic \
--enable-debug=yes
+binary-install/libglib2.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 libgio-fam.install libglib2.0-0.install \
+ libglib2.0-0-refdbg.install libglib2.0-dbg.install \
+ libglib2.0-dev.install \
+ libglib2.0-udeb.install libglib2.0-bin.links \
+ libglib2.0-dev.links \
+ libglib2.0-0.dirs libglib2.0-0.triggers; \
+ do \
+ sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
+ debian/$${file}.in > debian/$$file; \
+ done
+
clean::
sed \
-e "s#@SONAME@#$(SONAME)#g" \
signature.asc
Description: Digital signature
