Source: libpng Version: 1.2.46-1 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: ubuntu-patch oneiric origin-ubuntu
Hi guys, Please find attached a patch to libpng 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. 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
diff -Nru libpng-1.2.46/debian/changelog libpng-1.2.46/debian/changelog --- libpng-1.2.46/debian/changelog 2011-07-14 20:12:34.000000000 -0700 +++ libpng-1.2.46/debian/changelog 2011-07-17 02:28:06.000000000 -0700 @@ -1,3 +1,13 @@ +libpng (1.2.46-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Build for multiarch. Requires converting libpng3 from Arch: all to + Arch: any. + * Drop debian/libpng12-0-udeb.dirs, which just adds a pointless empty + directory to the udeb. + + -- Steve Langasek <vor...@debian.org> Sun, 17 Jul 2011 09:27:49 +0000 + libpng (1.2.46-1) unstable; urgency=high * New upstream release (Closes: #633871). diff -Nru libpng-1.2.46/debian/clean libpng-1.2.46/debian/clean --- libpng-1.2.46/debian/clean 1969-12-31 16:00:00.000000000 -0800 +++ libpng-1.2.46/debian/clean 2011-07-17 02:26:58.000000000 -0700 @@ -0,0 +1,3 @@ +debian/libpng12-dev.links +debian/libpng12-0.install +debian/libpng3.links diff -Nru libpng-1.2.46/debian/control libpng-1.2.46/debian/control --- libpng-1.2.46/debian/control 2011-07-05 17:05:10.000000000 -0700 +++ libpng-1.2.46/debian/control 2011-07-17 02:27:19.000000000 -0700 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Anibal Monsalve Salazar <ani...@debian.org> Uploaders: Nobuhiro Iwamatsu <iwama...@debian.org> -Build-Depends: debhelper (>= 7), libtool, automake, autoconf, zlib1g-dev, mawk +Build-Depends: debhelper (>= 8.1.3), libtool, automake, autoconf, zlib1g-dev, mawk Standards-Version: 3.9.2 Homepage: http://libpng.org/pub/png/libpng.html @@ -13,6 +13,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libpng12-dev (<= 1.2.8rel-7), mzscheme (<= 1:209-5), pngcrush (<= 1.5.10-2), pngmeta (<= 1.11-3), qemacs (<= 0.3.1-5), povray-3.5 (<= 3.5.0c-10) Replaces: libpng12-dev (<= 1.2.8rel-7) +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: PNG library - runtime libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. @@ -36,8 +38,9 @@ Package: libpng3 Section: oldlibs -Architecture: all +Architecture: any Depends: ${misc:Depends}, libpng12-0 (>= 1.2.5.0-2) +Multi-Arch: same Description: PNG library - runtime libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff -Nru libpng-1.2.46/debian/libpng12-0.install libpng-1.2.46/debian/libpng12-0.install --- libpng-1.2.46/debian/libpng12-0.install 2010-02-13 18:09:16.000000000 -0800 +++ libpng-1.2.46/debian/libpng12-0.install 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -usr/lib/libpng12.so.0* /lib diff -Nru libpng-1.2.46/debian/libpng12-0.install.in libpng-1.2.46/debian/libpng12-0.install.in --- libpng-1.2.46/debian/libpng12-0.install.in 1969-12-31 16:00:00.000000000 -0800 +++ libpng-1.2.46/debian/libpng12-0.install.in 2011-07-17 02:31:11.000000000 -0700 @@ -0,0 +1,2 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0* /lib/${DEB_HOST_MULTIARCH} + diff -Nru libpng-1.2.46/debian/libpng12-0-udeb.dirs libpng-1.2.46/debian/libpng12-0-udeb.dirs --- libpng-1.2.46/debian/libpng12-0-udeb.dirs 2006-10-16 00:33:51.000000000 -0700 +++ libpng-1.2.46/debian/libpng12-0-udeb.dirs 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -/usr/lib diff -Nru libpng-1.2.46/debian/libpng12-0-udeb.install libpng-1.2.46/debian/libpng12-0-udeb.install --- libpng-1.2.46/debian/libpng12-0-udeb.install 2010-02-13 18:09:16.000000000 -0800 +++ libpng-1.2.46/debian/libpng12-0-udeb.install 2011-07-17 02:26:59.000000000 -0700 @@ -1 +1 @@ -usr/lib/libpng12.so.0* /lib +usr/lib/*/libpng12.so.0* /lib diff -Nru libpng-1.2.46/debian/libpng12-dev.install libpng-1.2.46/debian/libpng12-dev.install --- libpng-1.2.46/debian/libpng12-dev.install 2010-02-13 18:09:16.000000000 -0800 +++ libpng-1.2.46/debian/libpng12-dev.install 2011-07-17 02:26:59.000000000 -0700 @@ -1,4 +1,4 @@ usr/include -usr/lib/pkgconfig -usr/lib/{libpng.a,libpng12.a,libpng.so} +usr/lib/*/pkgconfig +usr/lib/*/{libpng.a,libpng12.a,libpng.so} usr/bin diff -Nru libpng-1.2.46/debian/libpng12-dev.links libpng-1.2.46/debian/libpng12-dev.links --- libpng-1.2.46/debian/libpng12-dev.links 2010-02-13 18:09:16.000000000 -0800 +++ libpng-1.2.46/debian/libpng12-dev.links 1969-12-31 16:00:00.000000000 -0800 @@ -1,3 +0,0 @@ -/usr/share/man/man1/libpng12-config.1.gz /usr/share/man/man1/libpng-config.1.gz -/usr/include/libpng12 /usr/include/libpng -/lib/libpng12.so.0 /usr/lib/libpng12.so diff -Nru libpng-1.2.46/debian/libpng12-dev.links.in libpng-1.2.46/debian/libpng12-dev.links.in --- libpng-1.2.46/debian/libpng12-dev.links.in 1969-12-31 16:00:00.000000000 -0800 +++ libpng-1.2.46/debian/libpng12-dev.links.in 2011-07-17 02:31:59.000000000 -0700 @@ -0,0 +1,3 @@ +/usr/share/man/man1/libpng12-config.1.gz /usr/share/man/man1/libpng-config.1.gz +/usr/include/libpng12 /usr/include/libpng +/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so diff -Nru libpng-1.2.46/debian/libpng3.links libpng-1.2.46/debian/libpng3.links --- libpng-1.2.46/debian/libpng3.links 2011-03-12 19:40:24.000000000 -0800 +++ libpng-1.2.46/debian/libpng3.links 1969-12-31 16:00:00.000000000 -0800 @@ -1,3 +0,0 @@ -/lib/libpng12.so.0 /lib/libpng.so.3 -/lib/libpng12.so.0 /usr/lib/libpng.so.3 -/usr/share/doc/libpng12-0 /usr/share/doc/libpng3 diff -Nru libpng-1.2.46/debian/libpng3.links.in libpng-1.2.46/debian/libpng3.links.in --- libpng-1.2.46/debian/libpng3.links.in 1969-12-31 16:00:00.000000000 -0800 +++ libpng-1.2.46/debian/libpng3.links.in 2011-07-17 02:32:20.000000000 -0700 @@ -0,0 +1,2 @@ +/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 /usr/lib/${DEB_HOST_MULTIARCH}/libpng.so.3 +/usr/share/doc/libpng12-0 /usr/share/doc/libpng3 diff -Nru libpng-1.2.46/debian/rules libpng-1.2.46/debian/rules --- libpng-1.2.46/debian/rules 2011-07-05 17:07:41.000000000 -0700 +++ libpng-1.2.46/debian/rules 2011-07-17 02:26:59.000000000 -0700 @@ -8,6 +8,7 @@ # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS = -Wall -g @@ -21,7 +22,11 @@ dh_testdir #cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess . ./autogen.sh - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" build: build-arch build-indep build-arch: build-stamp @@ -43,6 +48,11 @@ dh_testdir dh_testroot dh_prep + set -e; for file in libpng12-0.install libpng12-dev.links libpng3.links; \ + do \ + sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \ + debian/$${file}.in > debian/$$file; \ + done dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
signature.asc
Description: Digital signature
