Merge lp:~vorlon/glib/multiarch into lp:~ubuntu-desktop/glib/ubuntu

Proposed by Steve Langasek
Status: Merged
Merged at revision: 62
Proposed branch: lp:~vorlon/glib/multiarch
Merge into: lp:~ubuntu-desktop/glib/ubuntu
Diff against target: 489 lines (+166/-32)
20 files modified
debian/changelog (+62/-0)
debian/clean (+10/-0)
debian/compat (+1/-1)
debian/control (+12/-4)
debian/control.in (+12/-4)
debian/libgio-fam.install.in (+1/-1)
debian/libglib2.0-0-refdbg.install.in (+1/-1)
debian/libglib2.0-0.dirs.in (+1/-1)
debian/libglib2.0-0.install.in (+4/-4)
debian/libglib2.0-0.postinst.in (+10/-6)
debian/libglib2.0-0.postrm.in (+5/-0)
debian/libglib2.0-0.triggers.in (+1/-0)
debian/libglib2.0-bin.links.in (+2/-2)
debian/libglib2.0-dbg.install.in (+1/-1)
debian/libglib2.0-dev.install.in (+4/-4)
debian/libglib2.0-dev.links.in (+1/-1)
debian/libglib2.0-udeb.install.in (+1/-1)
debian/patches/gio-modules-multiarch-compat.patch (+13/-0)
debian/patches/series (+1/-0)
debian/rules (+23/-1)
To merge this branch: bzr merge lp:~vorlon/glib/multiarch
Reviewer Review Type Date Requested Status
Martin Pitt Needs Fixing
Sebastien Bacher Pending
Robert Ancell Pending
Review via email: mp+54143@code.launchpad.net

Description of the change

This branch converts the glib2.0 package for multiarch: all contents of libglib2.0-0 are moved to /usr/lib/$arch and /lib/$arch, the module path is changed to /usr/lib/$arch/gio/modules with a patch to add a hard-coded fallback to /usr/lib/gio/modules for backwards compatibility, and Multi-Arch: same/foreign fields are added to the correct places in debian/control.

By and large this follows the same multiarch conversion protocol described at http://wiki.debian.org/Multiarch/Implementation which has been used for the other library conversions to date in natty, but because of the gio module lookup path, and because I'm not actually sure how to *test* that gio modules are working correctly, I'd appreciate the ubuntu-desktop team's review of this rather than just merging it directly. (I'm happy to handle the actual merge, do the changelog cleanup, etc - I just want some eyeballs on this before I push it.)

For convenience, test packages of this branch are available in my multiarch ppa at <https://launchpad.net/~vorlon/+archive/multiarch/>.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks for working on this!

Something went wrong with building libglib2.0-doc, it lost all HTML files (the package is basically empty).

Will reboot with the new packages now and do some extensive testing.

review: Needs Fixing
Revision history for this message
Martin Pitt (pitti) wrote :

I tested gphoto://, ftp://, and archive:// gvfs URLs successfully. This confirms that your "include
/usr/lib/gio/modules as a fallback directory for compatibility" patch works (i. e. as long as we don't have a multiarch'ed gvfs yet).

So aside from the -doc contents this looks fine to me.

Thanks!

lp:~vorlon/glib/multiarch updated
88. By Steve Langasek

don't use .in files for anything that doesn't actually contain a substitution;
fixes a problem where arch: indep packages might have been created before
the common-install-arch rule has run. Thanks for catching this, Martin\!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-15 06:51:59 +0000
3+++ debian/changelog 2011-03-21 22:48:31 +0000
4@@ -1,3 +1,26 @@
5+glib2.0 (2.28.3-0ubuntu1+multiarch.3) natty; urgency=low
6+
7+ * debian/patches/gio-modules-multiarch-compat.patch: include
8+ /usr/lib/gio/modules as a fallback directory for compatibility, so we
9+ can drop the Breaks: on related packages and have a soft transition.
10+ * debian/libglib2.0-0.triggers also needs substitutions at build time.
11+
12+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 20 Mar 2011 18:43:12 -0700
13+
14+glib2.0 (2.28.3-0ubuntu1+multiarch.2) natty; urgency=low
15+
16+ * Drop debian/compat back down to 7; we don't need compat 9 since we're
17+ using cdbs.
18+ * Use globs and .in files, not env var substitutions.
19+
20+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 15 Mar 2011 16:38:58 -0700
21+
22+glib2.0 (2.28.3-0ubuntu1+multiarch.1) natty; urgency=low
23+
24+ * Merge from natty.
25+
26+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 15 Mar 2011 14:52:26 -0700
27+
28 glib2.0 (2.28.3-0ubuntu1) natty; urgency=low
29
30 * New upstream release
31@@ -6,12 +29,51 @@
32
33 -- Robert Ancell <robert.ancell@canonical.com> Tue, 15 Mar 2011 15:29:05 +1100
34
35+glib2.0 (2.28.2-0ubuntu1+multiarch.3) natty; urgency=low
36+
37+ * fix our maintainer script munging rule to use /g in the sed rule, and
38+ properly reference $(DEB_HOST_MULTIARCH) instead of
39+ $$(DEB_HOST_MULTIARCH).
40+
41+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 14 Mar 2011 11:11:21 -0700
42+
43+glib2.0 (2.28.2-0ubuntu1+multiarch.2) natty; urgency=low
44+
45+ * No-change rebuild to pick up fixed cdbs .la cleaning rules.
46+
47+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 13 Mar 2011 23:24:01 -0700
48+
49+glib2.0 (2.28.2-0ubuntu1+multiarch.1) natty; urgency=low
50+
51+ * Merge from natty.
52+ * Rebuild for final multiarch paths and pre-depend on ${misc:Pre-Depends}.
53+ * Don't export DEB_HOST_MULTIARCH, cdbs already does this for us.
54+
55+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 13 Mar 2011 17:34:47 -0700
56+
57 glib2.0 (2.28.2-0ubuntu1) natty; urgency=low
58
59 * New upstream release
60
61 -- Robert Ancell <robert.ancell@canonical.com> Tue, 08 Mar 2011 13:28:27 +1100
62
63+glib2.0 (2.28.1-1ubuntu1+multiarch.2) natty; urgency=low
64+
65+ * -doc package is Multi-Arch: foreign, not Multi-Arch: same.
66+
67+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 06 Mar 2011 02:10:50 -0800
68+
69+glib2.0 (2.28.1-1ubuntu1+multiarch.1) natty; urgency=low
70+
71+ * Build for multiarch.
72+ * Add Breaks for packages that install to /usr/lib/gio/modules, due to
73+ changed path.
74+ * Don't try to pass an empty --dbg-package package name to dh_strip, just
75+ unset DEB_DH_STRIP_ARGS_$(UDEB_PKG) altogether; needed for compatibility
76+ with debhelper compat 8.
77+
78+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 06 Mar 2011 01:21:59 -0800
79+
80 glib2.0 (2.28.1-1ubuntu1) natty; urgency=low
81
82 * Merge with Debian unstable, remaining Ubuntu changes:
83
84=== added file 'debian/clean'
85--- debian/clean 1970-01-01 00:00:00 +0000
86+++ debian/clean 2011-03-21 22:48:31 +0000
87@@ -0,0 +1,10 @@
88+debian/libgio-fam.install
89+debian/libglib2.0-0.install
90+debian/libglib2.0-0-refdbg.install
91+debian/libglib2.0-dbg.install
92+debian/libglib2.0-dev.install
93+debian/libglib2.0-udeb.install
94+debian/libglib2.0-bin.links
95+debian/libglib2.0-dev.links
96+debian/libglib2.0-0.dirs
97+debian/libglib2.0-0.triggers
98
99=== modified file 'debian/compat'
100--- debian/compat 2010-05-17 03:58:10 +0000
101+++ debian/compat 2011-03-21 22:48:31 +0000
102@@ -1,1 +1,1 @@
103-5
104+7
105
106=== modified file 'debian/control'
107--- debian/control 2011-02-21 02:55:16 +0000
108+++ debian/control 2011-03-21 22:48:31 +0000
109@@ -4,13 +4,13 @@
110 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
111 XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
112 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sjoerd Simons <sjoerd@debian.org>
113-Build-Depends: debhelper (>> 5.0.22),
114- cdbs (>= 0.4.90),
115+Build-Depends: debhelper (>= 8.1.2ubuntu1+multiarch.4),
116+ cdbs (>= 0.4.90ubuntu8),
117 pkg-config (>= 0.16.0),
118 gettext,
119 autotools-dev,
120 gnome-pkg-tools (>= 0.11),
121- dpkg-dev (>= 1.14.13),
122+ dpkg-dev (>= 1.16.0~ubuntu3+multiarch.4),
123 libpcre3-dev (>= 8.11),
124 desktop-file-utils,
125 gtk-doc-tools (>= 1.15),
126@@ -33,6 +33,8 @@
127 Replaces: libglib2.0-dev (<< 2.23.2-2)
128 Breaks: bamfdaemon (<< 0.2.42-0ubuntu2),
129 wncksyncdaemon (<< 0.2.8-0ubuntu2)
130+Multi-Arch: same
131+Pre-Depends: ${misc:Pre-Depends}
132 Description: The GLib library of C routines
133 GLib is a library containing many useful C routines for things such
134 as trees, hashes, lists, and strings. It is a useful general-purpose
135@@ -67,6 +69,7 @@
136 Conflicts: libglib2.0-0 (<< 2.25.11-2),
137 Replaces: libglib2.0-0 (<< 2.25.11-2),
138 libglib2.0-dev (<< 2.25.11-2)
139+Multi-Arch: foreign
140 Description: The programs for the GLib library
141 GLib is a library containing many useful C routines for things such
142 as trees, hashes, lists, and strings. It is a useful general-purpose
143@@ -104,6 +107,7 @@
144 libglib2.0-0 (= ${binary:Version})
145 Conflicts: libglib2.0-dbg
146 Replaces: libglib2.0-dbg
147+Multi-Arch: same
148 Description: The GLib libraries and debugging symbols
149 GLib is a library containing many useful C routines for things such
150 as trees, hashes, lists, and strings. It is a useful general-purpose
151@@ -117,6 +121,7 @@
152 Architecture: all
153 Depends: ${misc:Depends},
154 libglib2.0-0 (>= ${source:Version})
155+Multi-Arch: foreign
156 Description: Common files for GLib library
157 GLib is a library containing many useful C routines for things such
158 as trees, hashes, lists, and strings. It is a useful general-purpose
159@@ -130,6 +135,7 @@
160 Architecture: all
161 Depends: ${misc:Depends}
162 Suggests: devhelp
163+Multi-Arch: foreign
164 Description: Documentation files for the GLib library
165 GLib is a library containing many useful C routines for things such
166 as trees, hashes, lists, and strings. It is a useful general-purpose
167@@ -141,8 +147,9 @@
168 Package: libgio-fam
169 Architecture: hurd-i386 kfreebsd-i386 kfreebsd-amd64
170 Depends: ${shlibs:Depends},
171- ${misc:Depends}
172+ ${misc:Depends}, libglib2.0-0 (>= 2.28.1-1ubuntu1+multiarch.1)
173 Recommends: gamin
174+Multi-Arch: same
175 Description: GLib Input, Output and Streaming Library (fam module)
176 GIO is the input, output and streaming API of GLib. This package
177 provides a fam file and directory monitoring backend for it.
178@@ -154,6 +161,7 @@
179 Depends: ${misc:Depends},
180 ${shlibs:Depends},
181 libglib2.0-0 (= ${binary:Version})
182+Multi-Arch: same
183 Description: The GLib library of C routines - refdbg library
184 GLib is a library containing many useful C routines for things such
185 as trees, hashes, lists, and strings. It is a useful general-purpose
186
187=== modified file 'debian/control.in'
188--- debian/control.in 2011-02-21 02:55:16 +0000
189+++ debian/control.in 2011-03-21 22:48:31 +0000
190@@ -4,13 +4,13 @@
191 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
192 XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
193 Uploaders: @GNOME_TEAM@
194-Build-Depends: debhelper (>> 5.0.22),
195- cdbs (>= 0.4.90),
196+Build-Depends: debhelper (>= 8.1.2ubuntu1+multiarch.4),
197+ cdbs (>= 0.4.90ubuntu8),
198 pkg-config (>= 0.16.0),
199 gettext,
200 autotools-dev,
201 gnome-pkg-tools (>= 0.11),
202- dpkg-dev (>= 1.14.13),
203+ dpkg-dev (>= 1.16.0~ubuntu3+multiarch.4),
204 libpcre3-dev (>= 8.11),
205 desktop-file-utils,
206 gtk-doc-tools (>= 1.15),
207@@ -33,6 +33,8 @@
208 Replaces: @DEV_PKG@ (<< 2.23.2-2)
209 Breaks: bamfdaemon (<< 0.2.42-0ubuntu2),
210 wncksyncdaemon (<< 0.2.8-0ubuntu2)
211+Multi-Arch: same
212+Pre-Depends: ${misc:Pre-Depends}
213 Description: The GLib library of C routines
214 GLib is a library containing many useful C routines for things such
215 as trees, hashes, lists, and strings. It is a useful general-purpose
216@@ -67,6 +69,7 @@
217 Conflicts: @SHARED_PKG@ (<< 2.25.11-2),
218 Replaces: @SHARED_PKG@ (<< 2.25.11-2),
219 @DEV_PKG@ (<< 2.25.11-2)
220+Multi-Arch: foreign
221 Description: The programs for the GLib library
222 GLib is a library containing many useful C routines for things such
223 as trees, hashes, lists, and strings. It is a useful general-purpose
224@@ -104,6 +107,7 @@
225 @SHARED_PKG@ (= ${binary:Version})
226 Conflicts: libglib2.0-dbg
227 Replaces: libglib2.0-dbg
228+Multi-Arch: same
229 Description: The GLib libraries and debugging symbols
230 GLib is a library containing many useful C routines for things such
231 as trees, hashes, lists, and strings. It is a useful general-purpose
232@@ -117,6 +121,7 @@
233 Architecture: all
234 Depends: ${misc:Depends},
235 @SHARED_PKG@ (>= ${source:Version})
236+Multi-Arch: foreign
237 Description: Common files for GLib library
238 GLib is a library containing many useful C routines for things such
239 as trees, hashes, lists, and strings. It is a useful general-purpose
240@@ -130,6 +135,7 @@
241 Architecture: all
242 Depends: ${misc:Depends}
243 Suggests: devhelp
244+Multi-Arch: foreign
245 Description: Documentation files for the GLib library
246 GLib is a library containing many useful C routines for things such
247 as trees, hashes, lists, and strings. It is a useful general-purpose
248@@ -141,8 +147,9 @@
249 Package: libgio-fam
250 Architecture: hurd-i386 kfreebsd-i386 kfreebsd-amd64
251 Depends: ${shlibs:Depends},
252- ${misc:Depends}
253+ ${misc:Depends}, libglib2.0-0 (>= 2.28.1-1ubuntu1+multiarch.1)
254 Recommends: gamin
255+Multi-Arch: same
256 Description: GLib Input, Output and Streaming Library (fam module)
257 GIO is the input, output and streaming API of GLib. This package
258 provides a fam file and directory monitoring backend for it.
259@@ -154,6 +161,7 @@
260 Depends: ${misc:Depends},
261 ${shlibs:Depends},
262 @SHARED_PKG@ (= ${binary:Version})
263+Multi-Arch: same
264 Description: The GLib library of C routines - refdbg library
265 GLib is a library containing many useful C routines for things such
266 as trees, hashes, lists, and strings. It is a useful general-purpose
267
268=== renamed file 'debian/libgio-fam.install' => 'debian/libgio-fam.install.in'
269--- debian/libgio-fam.install 2010-05-17 03:58:10 +0000
270+++ debian/libgio-fam.install.in 2011-03-21 22:48:31 +0000
271@@ -1,1 +1,1 @@
272-debian/install/deb/usr/lib/gio usr/lib
273+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/gio usr/lib/${DEB_HOST_MULTIARCH}
274
275=== renamed file 'debian/libglib2.0-0-refdbg.install' => 'debian/libglib2.0-0-refdbg.install.in'
276--- debian/libglib2.0-0-refdbg.install 2011-02-21 02:55:16 +0000
277+++ debian/libglib2.0-0-refdbg.install.in 2011-03-21 22:48:31 +0000
278@@ -1,1 +1,1 @@
279-debian/install/refdbg/usr/lib/libgobject*.so* usr/lib/refdbg
280+debian/install/refdbg/usr/lib/${DEB_HOST_MULTIARCH}/libgobject*.so* usr/lib/${DEB_HOST_MULTIARCH}/refdbg
281
282=== renamed file 'debian/libglib2.0-0.dirs' => 'debian/libglib2.0-0.dirs.in'
283--- debian/libglib2.0-0.dirs 2010-07-12 06:04:04 +0000
284+++ debian/libglib2.0-0.dirs.in 2011-03-21 22:48:31 +0000
285@@ -1,2 +1,2 @@
286-/usr/lib/gio/modules
287+/usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
288 /usr/share/glib-2.0/schemas
289
290=== renamed file 'debian/libglib2.0-0.install' => 'debian/libglib2.0-0.install.in'
291--- debian/libglib2.0-0.install 2010-07-06 15:46:39 +0000
292+++ debian/libglib2.0-0.install.in 2011-03-21 22:48:31 +0000
293@@ -1,4 +1,4 @@
294-debian/install/deb/usr/lib/libglib-*.so.* lib
295-debian/install/deb/usr/lib/libg{object,module,thread,io}-*.so.* usr/lib
296-debian/install/deb/usr/bin/gio-querymodules usr/lib/glib-2.0
297-debian/install/deb/usr/bin/glib-compile-schemas usr/lib/glib-2.0
298+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libglib-*.so.* lib/${DEB_HOST_MULTIARCH}
299+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libg{object,module,thread,io}-*.so.* usr/lib/${DEB_HOST_MULTIARCH}
300+debian/install/deb/usr/bin/gio-querymodules usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
301+debian/install/deb/usr/bin/glib-compile-schemas usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
302
303=== renamed file 'debian/libglib2.0-0.postinst' => 'debian/libglib2.0-0.postinst.in'
304--- debian/libglib2.0-0.postinst 2010-08-05 02:34:50 +0000
305+++ debian/libglib2.0-0.postinst.in 2011-03-21 22:48:31 +0000
306@@ -10,13 +10,14 @@
307 /usr/share/glib-2.0/schemas)
308 # This is triggered everytime an application installs a
309 # GSettings schema
310- /usr/lib/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
311+ /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
312 ;;
313
314- /usr/lib/gio/modules)
315+ /usr/lib/#MULTIARCH#/gio/modules|/usr/lib/gio/modules)
316 # This is triggered everytime an application installs a GIO
317- # module into /usr/lib/gio/modules
318- /usr/lib/glib-2.0/gio-querymodules /usr/lib/gio/modules
319+ # module into /usr/lib/#MULTIARCH#/gio/modules or the
320+ # backwards-compatible /usr/lib/gio/modules directory
321+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules /usr/lib/gio/modules
322 ;;
323 esac
324 done
325@@ -27,8 +28,11 @@
326
327 # Also handle the initial installation
328 if [ -d /usr/share/glib-2.0/schemas ]; then
329- /usr/lib/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
330+ /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
331+fi
332+if [ -d /usr/lib/#MULTIARCH#/gio/modules ]; then
333+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules
334 fi
335 if [ -d /usr/lib/gio/modules ]; then
336- /usr/lib/glib-2.0/gio-querymodules /usr/lib/gio/modules
337+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/gio/modules
338 fi
339
340=== renamed file 'debian/libglib2.0-0.postrm' => 'debian/libglib2.0-0.postrm.in'
341--- debian/libglib2.0-0.postrm 2010-07-06 23:00:33 +0000
342+++ debian/libglib2.0-0.postrm.in 2011-03-21 22:48:31 +0000
343@@ -3,6 +3,11 @@
344
345 #DEBHELPER#
346
347+if [ -d /usr/lib/#MULTIARCH#/gio/modules ]; then
348+ # Purge the cache
349+ rm -f /usr/lib/#MULTIARCH#/gio/modules/giomodule.cache
350+ rmdir -p --ignore-fail-on-non-empty /usr/lib/#MULTIARCH#/gio/modules
351+fi
352 if [ -d /usr/lib/gio/modules ]; then
353 # Purge the cache
354 rm -f /usr/lib/gio/modules/giomodule.cache
355
356=== renamed file 'debian/libglib2.0-0.triggers' => 'debian/libglib2.0-0.triggers.in'
357--- debian/libglib2.0-0.triggers 2010-07-06 15:46:39 +0000
358+++ debian/libglib2.0-0.triggers.in 2011-03-21 22:48:31 +0000
359@@ -1,2 +1,3 @@
360+interest /usr/lib/${DEB_HOST_MULTIARCH}/gio/modules
361 interest /usr/lib/gio/modules
362 interest /usr/share/glib-2.0/schemas
363
364=== renamed file 'debian/libglib2.0-bin.links' => 'debian/libglib2.0-bin.links.in'
365--- debian/libglib2.0-bin.links 2010-07-13 16:04:25 +0000
366+++ debian/libglib2.0-bin.links.in 2011-03-21 22:48:31 +0000
367@@ -1,2 +1,2 @@
368-/usr/lib/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
369-/usr/lib/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas
370+/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
371+/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas
372
373=== renamed file 'debian/libglib2.0-dbg.install' => 'debian/libglib2.0-dbg.install.in'
374--- debian/libglib2.0-dbg.install 2010-05-17 03:58:10 +0000
375+++ debian/libglib2.0-dbg.install.in 2011-03-21 22:48:31 +0000
376@@ -1,1 +1,1 @@
377-debian/install/deb/usr/lib/debug/lib*.so* usr/lib/debug
378+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/debug/lib*.so* usr/lib/${DEB_HOST_MULTIARCH}/debug
379
380=== renamed file 'debian/libglib2.0-dev.install' => 'debian/libglib2.0-dev.install.in'
381--- debian/libglib2.0-dev.install 2010-06-23 07:56:54 +0000
382+++ debian/libglib2.0-dev.install.in 2011-03-21 22:48:31 +0000
383@@ -1,8 +1,8 @@
384 debian/install/deb/usr/include/* usr/include
385-debian/install/deb/usr/lib/lib*.{la,a} usr/lib
386-debian/install/deb/usr/lib/libg{object,module,thread,io}*.so usr/lib
387-debian/install/deb/usr/lib/glib-2.0 usr/lib
388-debian/install/deb/usr/lib/pkgconfig usr/lib
389+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/lib*.{la,a} usr/lib/${DEB_HOST_MULTIARCH}
390+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/libg{object,module,thread,io}*.so usr/lib/${DEB_HOST_MULTIARCH}
391+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0 usr/lib/${DEB_HOST_MULTIARCH}
392+debian/install/deb/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig usr/lib/${DEB_HOST_MULTIARCH}
393 debian/install/deb/usr/share/aclocal usr/share
394 debian/install/deb/usr/share/glib-2.0/gdb usr/share/glib-2.0
395 debian/install/deb/usr/share/glib-2.0/gettext usr/share/glib-2.0
396
397=== renamed file 'debian/libglib2.0-dev.links' => 'debian/libglib2.0-dev.links.in'
398--- debian/libglib2.0-dev.links 2011-02-21 02:55:16 +0000
399+++ debian/libglib2.0-dev.links.in 2011-03-21 22:48:31 +0000
400@@ -1,1 +1,1 @@
401-lib/libglib-2.0.so.0 usr/lib/libglib-2.0.so
402+lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so
403
404=== renamed file 'debian/libglib2.0-udeb.install' => 'debian/libglib2.0-udeb.install.in'
405--- debian/libglib2.0-udeb.install 2010-05-17 03:58:10 +0000
406+++ debian/libglib2.0-udeb.install.in 2011-03-21 22:48:31 +0000
407@@ -1,2 +1,2 @@
408-debian/install/udeb/usr/lib/lib*.so.* usr/lib
409+debian/install/udeb/usr/lib/${DEB_HOST_MULTIARCH}/lib*.so.* usr/lib
410 debian/install/udeb/usr/share/locale usr/share
411
412=== added file 'debian/patches/gio-modules-multiarch-compat.patch'
413--- debian/patches/gio-modules-multiarch-compat.patch 1970-01-01 00:00:00 +0000
414+++ debian/patches/gio-modules-multiarch-compat.patch 2011-03-21 22:48:31 +0000
415@@ -0,0 +1,13 @@
416+Index: glib2.0-2.28.3/gio/giomodule.c
417+===================================================================
418+--- glib2.0-2.28.3.orig/gio/giomodule.c
419++++ glib2.0-2.28.3/gio/giomodule.c
420+@@ -584,6 +584,8 @@
421+ loaded_dirs = TRUE;
422+
423+ g_io_modules_scan_all_in_directory (GIO_MODULE_DIR);
424++ /* Hard-coded fallback directory for pre-multiarch compatibility */
425++ g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
426+
427+ module_path = g_getenv ("GIO_EXTRA_MODULES");
428+
429
430=== modified file 'debian/patches/series'
431--- debian/patches/series 2011-02-21 02:55:16 +0000
432+++ debian/patches/series 2011-03-21 22:48:31 +0000
433@@ -5,3 +5,4 @@
434 #05_file_size_units.patch
435 60_wait-longer-for-threads-to-die.patch
436 71_gio_launch_handler.patch
437+gio-modules-multiarch-compat.patch
438
439=== modified file 'debian/rules'
440--- debian/rules 2011-02-21 02:55:16 +0000
441+++ debian/rules 2011-03-21 22:48:31 +0000
442@@ -43,13 +43,14 @@
443 DEB_DH_MAKESHLIBS_ARGS_$(REFDBG_PKG) = --no-act
444 DEB_DH_STRIP_ARGS_$(REFDBG_PKG) = --no-act
445 # Don't put the symbols in the -dbg package
446-DEB_DH_STRIP_ARGS_$(UDEB_PKG) = --dbg-package=
447+DEB_DH_STRIP_ARGS_$(UDEB_PKG) =
448
449 DEB_MAKE_CHECK_TARGET = -k check || true
450
451 # configure flags
452 DEB_CONFIGURE_EXTRA_FLAGS := \
453 --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
454+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
455 --with-pcre=system
456
457 DEB_CONFIGURE_FLAGS_deb := \
458@@ -62,6 +63,26 @@
459 --disable-Bsymbolic \
460 --enable-debug=yes
461
462+binary-install/libglib2.0-0::
463+ for script in postinst postrm; do \
464+ sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
465+ debian/$(cdbs_curpkg).$$script.in \
466+ > debian/$(cdbs_curpkg).$$script ; \
467+ done
468+
469+
470+common-install-arch::
471+ for file in libgio-fam.install libglib2.0-0.install \
472+ libglib2.0-0-refdbg.install libglib2.0-dbg.install \
473+ libglib2.0-dev.install \
474+ libglib2.0-udeb.install libglib2.0-bin.links \
475+ libglib2.0-dev.links \
476+ libglib2.0-0.dirs libglib2.0-0.triggers; \
477+ do \
478+ sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
479+ debian/$${file}.in > debian/$$file; \
480+ done
481+
482 clean::
483 sed \
484 -e "s#@SONAME@#$(SONAME)#g" \
485@@ -77,3 +98,4 @@
486 -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
487 -e "s#@REFDBG_PKG@#$(REFDBG_PKG)#g" \
488 debian/control.in > debian/control
489+ rm -f debian/libglib2.0-0.postinst debian/libglib2.0-0.postrm

Subscribers

People subscribed via source and target branches

to all changes: