tags 569697 + patch
thanks
On Sat, 13 Feb 2010 at 18:28:51 +0000, Mark Brown wrote:
> You appear to have neglected to actually attach the patch.
Sorry, see attached (or the bzr repository I referenced earlier, which is
a branch from yours). I've been using the patched version myself for a couple
of weeks and haven't noticed any problems.
> Given some of the issues with transitions done by some of the people
> driving the multiarch stuff I'm also inclined
Your mail seems to have been truncated, but I get the general idea...
This isn't a transition as such, since multiarch packages don't need to
migrate to multiarch in any particular order: my testing was done with a
non-multiarch libc6 and seems fine. No problem if you don't want to upload
anyway, though; my goal was mainly to get some good examples of multiarch
packages that can be used as test cases.
Regards,
Simon
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [email protected]
# target_branch: nosmart+http://bzr.debian.org/bzr/pkg-\
# zlib/zlib/debian/
# testament_sha1: dcdb2c3b82f0c2bd0e44eeb4a6ce9ed31ec8a387
# timestamp: 2010-02-13 14:38:54 +0000
# base_revision_id: broo...@finisterre-20100121200252-oed0z1hopq7fgm4j
#
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog 2010-01-21 20:02:52 +0000
+++ debian/changelog 2010-02-13 14:32:44 +0000
@@ -1,3 +1,10 @@
+zlib (1:1.2.3.5.dfsg-2+multiarch1) UNRELEASED; urgency=low
+
+ * Use multiarch directory for the library.
+ * zlib1g is now Multi-Arch: same.
+
+ -- Simon McVittie <[email protected]> Sat, 13 Feb 2010 14:14:04 +0000
+
zlib (1:1.2.3.5.dfsg-2) unstable; urgency=low
* Break libxml2 (< 2.7.6.dfsg-2) due to ABI abuse peering inside
=== modified file 'debian/control'
--- debian/control 2010-01-21 20:02:52 +0000
+++ debian/control 2010-02-13 14:32:44 +0000
@@ -9,6 +9,7 @@
Package: zlib1g
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}
Priority: required
Conflicts: zlib1 (<= 1:1.0.4-7)
=== modified file 'debian/rules'
--- debian/rules 2009-12-24 17:19:04 +0000
+++ debian/rules 2010-02-13 14:14:37 +0000
@@ -71,7 +71,7 @@
if [ ! -f Makefile.stash ]; then cp Makefile Makefile.stash ; fi
if [ ! -f zlibdefs.h.stash ]; then cp zlibdefs.h zlibdefs.h.stash ; fi
- AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc" CFLAGS="$(CFLAGS)" uname=GNU ./configure --shared --prefix=/usr
+ AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc" CFLAGS="$(CFLAGS)" uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_GNU_TYPE)
touch $@
=== modified file 'debian/zlib1g-dev.install'
--- debian/zlib1g-dev.install 2009-12-24 16:16:10 +0000
+++ debian/zlib1g-dev.install 2010-02-13 14:14:37 +0000
@@ -1,5 +1,5 @@
usr/include/*
-usr/lib/libz.a
-usr/lib/libz.so
+usr/lib/*/libz.a
+usr/lib/*/libz.so
usr/share/man/man3/*
-usr/lib/pkgconfig/zlib.pc
+usr/lib/*/pkgconfig/zlib.pc usr/lib/pkgconfig
=== modified file 'debian/zlib1g-udeb.install'
--- debian/zlib1g-udeb.install 2007-12-16 14:03:09 +0000
+++ debian/zlib1g-udeb.install 2010-02-13 14:14:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
=== modified file 'debian/zlib1g.install'
--- debian/zlib1g.install 2007-06-12 21:13:14 +0000
+++ debian/zlib1g.install 2010-02-13 14:14:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
# Begin bundle
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
kEAApZU=
