Package: libpaper Version: 1.1.24+nmu1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch precise
The following patch transitions libpaper to use of the multiarch library paths as documented at http://wiki.debian.org/Multiarch/Implementation. Could you please review and apply it? (I'm particularly interested in this because it will allow me to use multiarch to cross-build one of my packages, groff.) * Build for multiarch. diff -Nru libpaper-1.1.24+nmu1/debian/clean libpaper-1.1.24+nmu1ubuntu1/debian/clean --- libpaper-1.1.24+nmu1/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ libpaper-1.1.24+nmu1ubuntu1/debian/clean 2011-11-23 00:15:32.000000000 +0000 @@ -0,0 +1,2 @@ +debian/libpaper1.install +debian/libpaper-dev.install diff -Nru libpaper-1.1.24+nmu1/debian/control libpaper-1.1.24+nmu1ubuntu1/debian/control --- libpaper-1.1.24+nmu1/debian/control 2010-02-24 22:11:41.000000000 +0000 +++ libpaper-1.1.24+nmu1ubuntu1/debian/control 2011-11-23 00:21:46.000000000 +0000 @@ -3,10 +3,12 @@ Priority: optional Maintainer: Giuseppe Sacco <eppes...@debian.org> Standards-Version: 3.6.2 -Build-Depends: autotools-dev, debhelper (>= 7), po-debconf, autoconf +Build-Depends: autotools-dev, debhelper (>= 8.1.3~), po-debconf, autoconf Package: libpaper1 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.28) Replaces: libpaperg (<< 1.1.9) Provides: libpaperg @@ -19,6 +22,7 @@ Package: libpaper-utils Section: utils Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: libpaperg (<< 1.1.9), libpaper1 (<< 1.1.10) Description: library for handling paper characteristics (utilities) @@ -33,6 +37,8 @@ Package: libpaper-dev Section: libdevel Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: libpaper1 (= ${binary:Version}), ${misc:Depends} Replaces: libpaperg-dev (<< 1.1.9) Provides: libpaperg-dev diff -Nru libpaper-1.1.24+nmu1/debian/libpaper-dev.install libpaper-1.1.24+nmu1ubuntu1/debian/libpaper-dev.install --- libpaper-1.1.24+nmu1/debian/libpaper-dev.install 2002-11-11 00:56:08.000000000 +0000 +++ libpaper-1.1.24+nmu1ubuntu1/debian/libpaper-dev.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -debian/tmp/usr/include -debian/tmp/usr/lib/libpaper.a -debian/tmp/usr/lib/libpaper.so -debian/tmp/usr/share/man/man3 diff -Nru libpaper-1.1.24+nmu1/debian/libpaper-dev.install.in libpaper-1.1.24+nmu1ubuntu1/debian/libpaper-dev.install.in --- libpaper-1.1.24+nmu1/debian/libpaper-dev.install.in 1970-01-01 01:00:00.000000000 +0100 +++ libpaper-1.1.24+nmu1ubuntu1/debian/libpaper-dev.install.in 2011-11-23 00:14:07.000000000 +0000 @@ -0,0 +1,4 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/libpaper.a +debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/libpaper.so +debian/tmp/usr/share/man/man3 diff -Nru libpaper-1.1.24+nmu1/debian/libpaper1.install libpaper-1.1.24+nmu1ubuntu1/debian/libpaper1.install --- libpaper-1.1.24+nmu1/debian/libpaper1.install 2002-11-19 07:30:23.000000000 +0000 +++ libpaper-1.1.24+nmu1ubuntu1/debian/libpaper1.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libpaper.so.* -debian/tmp/usr/share/man/man5 diff -Nru libpaper-1.1.24+nmu1/debian/libpaper1.install.in libpaper-1.1.24+nmu1ubuntu1/debian/libpaper1.install.in --- libpaper-1.1.24+nmu1/debian/libpaper1.install.in 1970-01-01 01:00:00.000000000 +0100 +++ libpaper-1.1.24+nmu1ubuntu1/debian/libpaper1.install.in 2011-11-23 00:14:07.000000000 +0000 @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/libpaper.so.* +debian/tmp/usr/share/man/man5 diff -Nru libpaper-1.1.24+nmu1/debian/rules libpaper-1.1.24+nmu1ubuntu1/debian/rules --- libpaper-1.1.24+nmu1/debian/rules 2010-02-24 21:58:13.000000000 +0000 +++ libpaper-1.1.24+nmu1ubuntu1/debian/rules 2011-11-23 00:16:00.000000000 +0000 @@ -6,12 +6,14 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) package := $(firstword $(shell dh_listpackages)) prefix := $(CURDIR)/debian/tmp share := /usr/share config_flags := --prefix=/usr \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --sysconfdir=/etc \ --mandir=$(share)/man \ --infodir=$(share)/info \ @@ -73,6 +75,9 @@ && sed -n '/^__END_PAPERSPECS__/,$$p' debian/libpaper1.config mv /tmp/libpaper1.new debian/libpaper1.config +debian/%.install: debian/%.install.in + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ + binary-indep: DH_OPTIONS=-i binary-indep: checkroot build dh_prep @@ -86,7 +91,7 @@ dh_builddeb binary-arch: DH_OPTIONS=-a -binary-arch: checkroot build +binary-arch: checkroot build debian/libpaper1.install debian/libpaper-dev.install dh_prep dh_installdirs @@ -103,7 +108,7 @@ dh_makeshlibs dh_installdebconf dh_installdeb - dh_shlibdeps -L$(package) -ldebian/$(package)/usr/lib + dh_shlibdeps -L$(package) -ldebian/$(package)/usr/lib/$(DEB_HOST_MULTIARCH) dh_gencontrol dh_md5sums dh_builddeb Thanks, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
