r30904 - in /desktop/experimental/glib2.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Oct 21 16:51:23 UTC 2011
Author: biebl
Date: Fri Oct 21 16:51:22 2011
New Revision: 30904
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30904
Log:
Transition to multiarch, thanks Steve. Closes: #634099
Added:
desktop/experimental/glib2.0/debian/clean
desktop/experimental/glib2.0/debian/libgio-fam.install.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libgio-fam.install
desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install
desktop/experimental/glib2.0/debian/libglib2.0-0.dirs.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.dirs
desktop/experimental/glib2.0/debian/libglib2.0-0.install.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.install
desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.postinst
desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.postrm
desktop/experimental/glib2.0/debian/libglib2.0-0.triggers.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.triggers
desktop/experimental/glib2.0/debian/libglib2.0-bin.links.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-bin.links
desktop/experimental/glib2.0/debian/libglib2.0-dbg.install.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-dbg.install
desktop/experimental/glib2.0/debian/libglib2.0-dev.install.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-dev.install
desktop/experimental/glib2.0/debian/libglib2.0-dev.links.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-dev.links
desktop/experimental/glib2.0/debian/libglib2.0-udeb.install.in
- copied, changed from r30903, desktop/experimental/glib2.0/debian/libglib2.0-udeb.install
desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch
Removed:
desktop/experimental/glib2.0/debian/libgio-fam.install
desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install
desktop/experimental/glib2.0/debian/libglib2.0-0.dirs
desktop/experimental/glib2.0/debian/libglib2.0-0.install
desktop/experimental/glib2.0/debian/libglib2.0-0.postinst
desktop/experimental/glib2.0/debian/libglib2.0-0.postrm
desktop/experimental/glib2.0/debian/libglib2.0-0.triggers
desktop/experimental/glib2.0/debian/libglib2.0-bin.links
desktop/experimental/glib2.0/debian/libglib2.0-dbg.install
desktop/experimental/glib2.0/debian/libglib2.0-dev.install
desktop/experimental/glib2.0/debian/libglib2.0-dev.links
desktop/experimental/glib2.0/debian/libglib2.0-udeb.install
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control
desktop/experimental/glib2.0/debian/control.in
desktop/experimental/glib2.0/debian/patches/series
desktop/experimental/glib2.0/debian/rules
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Oct 21 16:51:22 2011
@@ -8,7 +8,10 @@
* debian/patches/80_gtk_doc_out_of_tree.patch:
- Added. Fix documentation generation when build out of tree
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 21 Oct 2011 16:57:26 +0200
+ [ Michael Biebl ]
+ * Transition to multiarch, thanks Steve. Closes: #634099
+
+ -- Michael Biebl <biebl at debian.org> Fri, 21 Oct 2011 18:44:05 +0200
glib2.0 (2.30.1-1) experimental; urgency=low
Added: desktop/experimental/glib2.0/debian/clean
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/clean?rev=30904&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/clean (added)
+++ desktop/experimental/glib2.0/debian/clean [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,0 +1,12 @@
+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-udeb.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: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Fri Oct 21 16:51:22 2011
@@ -2,15 +2,15 @@
Section: libs
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>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 8),
- cdbs (>= 0.4.90),
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+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),
@@ -41,6 +41,8 @@
gdm3 (<< 3.0.3),
libgtk-3-0 (<< 3.0.12)
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
@@ -74,6 +76,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
@@ -122,6 +125,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
@@ -135,6 +139,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
@@ -148,6 +153,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.
@@ -159,6 +165,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: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
- 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),
@@ -41,6 +41,8 @@
gdm3 (<< 3.0.3),
libgtk-3-0 (<< 3.0.12)
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
@@ -74,6 +76,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
@@ -122,6 +125,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
@@ -135,6 +139,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
@@ -148,6 +153,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.
@@ -159,6 +165,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
Copied: desktop/experimental/glib2.0/debian/libgio-fam.install.in (from r30903, desktop/experimental/glib2.0/debian/libgio-fam.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libgio-fam.install.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libgio-fam.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libgio-fam.install.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,1 +1,1 @@
-debian/install/deb/usr/lib/gio usr/lib
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/gio usr/lib/${DEB_HOST_MULTIARCH}
Copied: desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0-refdbg.install.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,1 +1,1 @@
-debian/install/refdbg/usr/lib/libgobject*.so* usr/lib/refdbg
+debian/install/refdbg/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so* usr/lib/${DEB_HOST_MULTIARCH}/refdbg
Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.dirs.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.dirs)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.dirs.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.dirs [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.dirs.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,2 +1,2 @@
-/usr/lib/gio/modules
+/usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
/usr/share/glib-2.0/schemas
Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.install.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.install.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.install.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,7 +1,7 @@
-debian/install/deb/usr/lib/libglib*.so.* lib
-debian/install/deb/usr/lib/libgobject*.so.* usr/lib
-debian/install/deb/usr/lib/libgmodule*.so.* usr/lib
-debian/install/deb/usr/lib/libgthread*.so.* usr/lib
-debian/install/deb/usr/lib/libgio*.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
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libglib*.so.* lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgmodule*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgio*.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
Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.postinst)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.postinst [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -10,13 +10,14 @@
/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/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
;;
- /usr/lib/gio/modules)
+ /usr/lib/#MULTIARCH#/gio/modules|/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
+ # 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
@@ -27,8 +28,11 @@
# 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
+ /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/glib-2.0/gio-querymodules /usr/lib/gio/modules
+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/gio/modules
fi
Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.postrm)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.postrm [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.postrm.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -3,6 +3,11 @@
#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
Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.triggers.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-0.triggers)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.triggers.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.triggers [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.triggers.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,2 +1,3 @@
+interest /usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
interest /usr/lib/gio/modules
interest /usr/share/glib-2.0/schemas
Copied: desktop/experimental/glib2.0/debian/libglib2.0-bin.links.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-bin.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-bin.links.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-bin.links [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-bin.links.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,2 +1,2 @@
-/usr/lib/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
-/usr/lib/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas
+/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
Copied: desktop/experimental/glib2.0/debian/libglib2.0-dbg.install.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-dbg.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-dbg.install.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-dbg.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-dbg.install.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,1 +1,1 @@
-debian/install/deb/usr/lib/debug/lib*.so* usr/lib/debug
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/debug/lib*.so* usr/lib/debug
Copied: desktop/experimental/glib2.0/debian/libglib2.0-dev.install.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-dev.install.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-dev.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-dev.install.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,13 +1,12 @@
debian/install/deb/usr/include/* usr/include
-debian/install/deb/usr/lib/lib*.a usr/lib
-debian/install/deb/usr/lib/lib*.la usr/lib
-debian/install/deb/usr/lib/libgobject*.so usr/lib
-debian/install/deb/usr/lib/libgmodule*.so usr/lib
-debian/install/deb/usr/lib/libgthread*.so usr/lib
-debian/install/deb/usr/lib/libgio*.so usr/lib
-debian/install/deb/usr/lib/glib-2.0 usr/lib
-debian/install/deb/usr/lib/gdbus-2.0/codegen/*.py usr/lib/gdbus-2.0/codegen
-debian/install/deb/usr/lib/pkgconfig usr/lib
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/lib*.a usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgmodule*.so usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so usr/lib/${DEB_HOST_MULTIARCH}
+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libgio*.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}/gdbus-2.0/codegen/*.py usr/lib/${DEB_HOST_MULTIARCH}/gdbus-2.0/codegen
+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
Copied: desktop/experimental/glib2.0/debian/libglib2.0-dev.links.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-dev.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-dev.links.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-dev.links [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-dev.links.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,1 +1,1 @@
-lib/libglib-2.0.so.0 usr/lib/libglib-2.0.so
+lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so
Copied: desktop/experimental/glib2.0/debian/libglib2.0-udeb.install.in (from r30903, desktop/experimental/glib2.0/debian/libglib2.0-udeb.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-udeb.install.in?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-udeb.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-udeb.install.in [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,2 +1,2 @@
-debian/install/udeb/usr/lib/lib*.so.* usr/lib
+debian/install/udeb/usr/lib/${DEB_HOST_MULTIARCH}/lib*.so.* usr/lib
debian/install/udeb/usr/share/locale usr/share
Added: desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch?rev=30904&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch [utf-8] Fri Oct 21 16:51:22 2011
@@ -1,0 +1,13 @@
+Index: glib2.0-2.29.18/gio/giomodule.c
+===================================================================
+--- glib2.0-2.29.18.orig/gio/giomodule.c 2011-08-30 06:09:51.000000000 +0200
++++ glib2.0-2.29.18/gio/giomodule.c 2011-09-02 08:25:45.715970977 +0200
+@@ -765,6 +765,8 @@
+
+ /* Then load the compiled in path */
+ g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);
++ /* Hard-coded fallback directory for pre-multiarch compatibility */
++ g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
+
+ g_io_module_scope_free (scope);
+
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Fri Oct 21 16:51:22 2011
@@ -5,3 +5,4 @@
61_glib-compile-schemas-path.patch
70-fix-race-in-gdbus-connection-test.patch
80_gtk_doc_out_of_tree.patch
+90-gio-modules-multiarch-compat.patch
Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=30904&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Fri Oct 21 16:51:22 2011
@@ -51,6 +51,7 @@
# 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 @@
DEB_CONFIGURE_FLAGS_refdbg := \
--disable-Bsymbolic \
--enable-debug=yes
+
+binary-install/libglib2.0-0::
+ set -e; 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::
+ set -e; 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 \
More information about the pkg-gnome-commits
mailing list