Source: expat Version: 2.0.1-7 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
Hi folks, Please find attached a patch to expat 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. Would be great if you could apply this patch to the Debian package, so we can whittle away ia32-libs for wheezy. :) Thanks, -- 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
=== modified file 'debian/control' --- debian/control 2009-12-29 22:18:35 +0000 +++ debian/control 2011-06-30 23:55:57 +0000 @@ -6,7 +6,8 @@ Uploaders: Ardo van Rangelrooij <a...@debian.org>, Daniel Leidert (dale) <daniel.leid...@wgdd.de> Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 5.0.22), dpatch, docbook-to-man, +Build-Depends: debhelper (>= 8.1.3), dpatch, docbook-to-man, + dpkg-dev (>= 1.16.0), gcc-multilib [i386 powerpc sparc s390] Homepage: http://expat.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/ @@ -60,6 +62,8 @@ Architecture: any Conflicts: wink (<= 1.5.1060-4) Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Description: XML parsing C library - runtime library This package contains the runtime, shared library of expat, the C library for parsing XML. Expat is a stream-oriented parser in === modified file 'debian/libexpat1-dev.install' --- debian/libexpat1-dev.install 2008-06-09 20:48:30 +0000 +++ debian/libexpat1-dev.install 2011-03-17 07:35:39 +0000 @@ -1,6 +1,6 @@ usr/include -usr/lib/*.a -usr/lib/*.la -usr/lib/*.so +usr/lib/*/*.a +usr/lib/*/*.la +usr/lib/*/*.so ../../doc/* usr/share/doc/libexpat1-dev/expat.html/ ../../conftools/expat.m4 usr/share/aclocal/ === modified file 'debian/libexpat1-udeb.install' --- debian/libexpat1-udeb.install 2008-06-09 20:48:30 +0000 +++ debian/libexpat1-udeb.install 2011-03-17 07:35:39 +0000 @@ -1,1 +1,1 @@ -usr/lib/libexpat.so.* +usr/lib/*/libexpat.so.* usr/lib === modified file 'debian/libexpat1.install' --- debian/libexpat1.install 2004-02-29 11:01:15 +0000 +++ debian/libexpat1.install 2011-03-17 07:31:18 +0000 @@ -1,1 +1,1 @@ -usr/lib/*.so.* +usr/lib/*/*.so.* === modified file 'debian/rules' --- debian/rules 2009-11-03 22:41:38 +0000 +++ debian/rules 2011-03-17 07:35:39 +0000 @@ -11,6 +11,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) BUILD64 = $(filter $(DEB_HOST_ARCH), i386 powerpc sparc s390) @@ -47,12 +48,12 @@ build/config.status: configure dh_testdir (mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man) + ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)) buildw/config.status: configure dh_testdir (mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS) -DXML_UNICODE" LDFLAGS="$(LDFLAGS)" \ - ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man) + ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)) build64/config.status: configure dh_testdir @@ -114,7 +115,7 @@ $(CURDIR)/debian/libexpat1-dev/usr/share/aclocal/* dh_makeshlibs -s -V --add-udeb=$(UPACKAGE) dh_installdeb -s - dh_shlibdeps -s -l $(CURDIR)/debian/libexpat1/usr/lib:$(CURDIR)/debian/lib64expat1/usr/lib64 + dh_shlibdeps -s -l $(CURDIR)/debian/libexpat1/usr/lib/$(DEB_HOST_MULTIARCH):$(CURDIR)/debian/lib64expat1/usr/lib64 dh_gencontrol -s dh_md5sums -s dh_builddeb -s
signature.asc
Description: Digital signature
