Hi Mark, Minor update to this zlib multiarch patch, to mark zlib1g-dev Multi-Arch: same; I've verified that the amd64 and armel builds of the package have no conflicting contents, so this should work without further modification.
Cheers, -- 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
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vor...@debian.org-20111110184821-cr2twd1r5bk65kci # target_branch: :parent # testament_sha1: abedbe395a31ab067641752974e67f22b1c96e58 # timestamp: 2011-11-10 10:50:50 -0800 # base_revision_id: broonie@finisterre-20100121200252-oed0z1hopq7fgm4j # # Begin patch === modified file 'debian/changelog' --- debian/changelog 2010-01-21 20:02:52 +0000 +++ debian/changelog 2011-11-10 18:48:21 +0000 @@ -1,3 +1,14 @@ +zlib (1:1.2.3.5.dfsg-2+multiarch1) UNRELEASED; urgency=low + + [ Simon McVittie ] + * Use multiarch directory for the library. + * zlib1g is now Multi-Arch: same. + + [ Steve Langasek ] + * zlib1g-dev is also Multi-Arch: same, no further changes required. + + -- Simon McVittie <s...@debian.org> 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 2011-11-10 18:48:21 +0000 @@ -5,11 +5,13 @@ Standards-Version: 3.8.3 Homepage: http://zlib.net/ XS-VCS-Bzr: http://bzr.debian.org/bzr/pkg-zlib/zlib/debian -Build-Depends: debhelper (>= 6.0.7~), binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc] +Build-Depends: debhelper (>= 8.1.3~), binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc], dpkg-dev (>= 1.16.0) Package: zlib1g Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} Priority: required Conflicts: zlib1 (<= 1:1.0.4-7) Breaks: libxml2 (< 2.7.6.dfsg-2) @@ -21,6 +23,7 @@ Package: zlib1g-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: zlib1g (= ${binary:Version}), libc6-dev | libc-dev Conflicts: zlib1-dev Provides: libz-dev === modified file 'debian/rules' --- debian/rules 2009-12-24 17:19:04 +0000 +++ debian/rules 2011-06-24 20:52:21 +0000 @@ -15,6 +15,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_GNU_OS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS = -Wall -g -D_REENTRANT @@ -71,7 +72,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_MULTIARCH) touch $@ === modified file 'debian/zlib1g-dev.install' --- debian/zlib1g-dev.install 2009-12-24 16:16:10 +0000 +++ debian/zlib1g-dev.install 2011-06-24 20:55:27 +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 === modified file 'debian/zlib1g-udeb.install' --- debian/zlib1g-udeb.install 2007-12-16 14:03:09 +0000 +++ debian/zlib1g-udeb.install 2011-06-24 20:53:20 +0000 @@ -1,1 +1,1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* usr/lib === 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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 KEgtRYl0AA==
signature.asc
Description: Digital signature
