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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== added file 'debian/clean'
--- debian/clean 1970-01-01 00:00:00 +
+++ debian/clean 2011-07-16 05:04:38 +
@@ -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 +
+++ debian/compat 2011-07-16 00:48:52 +
@@ -1,1 +1,1 @@
-5
+7
=== modified file 'debian/control'
--- debian/control 2011-05-31 21:16:39 +
+++ debian/control 2011-07-16 01:12:24 +
@@ -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,
