Your message dated Mon, 18 Jul 2011 15:02:27 +0000
with message-id <[email protected]>
and subject line Bug#634151: fixed in libpng 1.5.4-2
has caused the Debian Bug report #634151,
regarding Please transition libpng for multiarch
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
634151: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634151
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: libpng
Version: 1.2.46-1
Tags: patch
User: [email protected]
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/
[email protected]                                     [email protected]
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 <[email protected]>  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 <[email protected]>
 Uploaders: Nobuhiro Iwamatsu <[email protected]>
-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
 

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message ---
Source: libpng
Source-Version: 1.5.4-2

We believe that the bug you reported is fixed in the latest version of
libpng, which is due to be installed in the Debian FTP archive:

libpng-dev_1.5.4-2_amd64.deb
  to main/libp/libpng/libpng-dev_1.5.4-2_amd64.deb
libpng15-15-udeb_1.5.4-2_amd64.udeb
  to main/libp/libpng/libpng15-15-udeb_1.5.4-2_amd64.udeb
libpng15-15_1.5.4-2_amd64.deb
  to main/libp/libpng/libpng15-15_1.5.4-2_amd64.deb
libpng_1.5.4-2.debian.tar.bz2
  to main/libp/libpng/libpng_1.5.4-2.debian.tar.bz2
libpng_1.5.4-2.dsc
  to main/libp/libpng/libpng_1.5.4-2.dsc
libpng_1.5.4.orig.tar.bz2
  to main/libp/libpng/libpng_1.5.4.orig.tar.bz2



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Anibal Monsalve Salazar <[email protected]> (supplier of updated libpng package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Tue, 19 Jul 2011 00:49:57 +1000
Source: libpng
Binary: libpng15-15 libpng-dev libpng15-15-udeb
Architecture: source amd64
Version: 1.5.4-2
Distribution: experimental
Urgency: low
Maintainer: Anibal Monsalve Salazar <[email protected]>
Changed-By: Anibal Monsalve Salazar <[email protected]>
Description: 
 libpng-dev - PNG library - development
 libpng15-15 - PNG library - runtime
 libpng15-15-udeb - PNG library - minimal runtime library (udeb)
Closes: 634151
Changes: 
 libpng (1.5.4-2) experimental; urgency=low
 .
   * Port Steve Langasek's changes for 1.2.46-1
     - Build for multiarch. Closes: 634151
     - Drop debian/libpng15-15-udeb.dirs, which just adds a pointless empty
       directory to the udeb
   * Update debian/docs and debian/libpng15-15.docs
   * Add debian/libpng15-15.doc-base
   * Build-Depend on autotools-dev
Checksums-Sha1: 
 149974ef04e7a7ab0b41ff1541150232472ba608 1789 libpng_1.5.4-2.dsc
 d05d06e2da369faa470d14c7541e11d4e28a87a5 831870 libpng_1.5.4.orig.tar.bz2
 b483f7e286d93e58ebf9e850508ba12c1e114d90 15398 libpng_1.5.4-2.debian.tar.bz2
 3c60e208290edca87ff5aa3d9b8f77c9526f3f0c 229578 libpng15-15_1.5.4-2_amd64.deb
 02d2db83d7e3f955d91f2197be80f911fc0f3ef2 295224 libpng-dev_1.5.4-2_amd64.deb
 f779297cfad3f4ceaf5cd2c38c3e9346318e42da 79652 
libpng15-15-udeb_1.5.4-2_amd64.udeb
Checksums-Sha256: 
 419c12d23bbed6cf741358d997c450390d458fe89bec4ddab5db0a9651dbd2dc 1789 
libpng_1.5.4-2.dsc
 3954ed12794e7e70a4cb9b1d576af8869212a36abde33891b4876315dd36661d 831870 
libpng_1.5.4.orig.tar.bz2
 649d202d20a2d9b3e66a2c9807955be7afb078fae7c938cc5bdbfeb5acd9fd8d 15398 
libpng_1.5.4-2.debian.tar.bz2
 bf5d511be43ff8b6c303bf6fa8817a009bedd85451e606ed193d2c9d3ea8933e 229578 
libpng15-15_1.5.4-2_amd64.deb
 f1da072cb7160d36fefb294a33c3998d7d0fe0009898559c0fde051e81510526 295224 
libpng-dev_1.5.4-2_amd64.deb
 a1da8e2c6fb04e3df0b6c60c819971fbfbe1e39b79caa2bce9a8e23b8b1603d6 79652 
libpng15-15-udeb_1.5.4-2_amd64.udeb
Files: 
 33c7b70a6c3702c6353a9daebb351785 1789 libs optional libpng_1.5.4-2.dsc
 b43afe39237b69859522455b215f9e85 831870 libs optional libpng_1.5.4.orig.tar.bz2
 3a29bf84d5c1dfcba00c8a572aad3715 15398 libs optional 
libpng_1.5.4-2.debian.tar.bz2
 7747a29f466ff251eccf0f8fd3c66264 229578 libs optional 
libpng15-15_1.5.4-2_amd64.deb
 5d6906411a7650771048fdd90d7d19ea 295224 libdevel optional 
libpng-dev_1.5.4-2_amd64.deb
 a3360b638633f76b68d3490555bf1e87 79652 debian-installer extra 
libpng15-15-udeb_1.5.4-2_amd64.udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAEBCAAGBQJOJEoNAAoJEHxWrP6UeJfYGgwP/R9i99MqOnhOWcvaYVOMkXEm
fQbi3PFv1lURzPAwn8QGlKzoa8OftmgbDLRLHezXesbv7SyUrVNVSR8yhbapBB8k
NIfYYDpgWOl1nfT8DF1Kt8yvf+OBwrOpuZH9y6Gq7ac+l9AgTFjIbU4tLslMoI9C
pbwyZxlorLjnQsgntMNpygbA3O7MwHolATdtVW+tgRspWqyN322XfB30UHNJUXgc
DxHiFvoglSupsej+rSGM90KiyqY4qhGnavsX1wnr6e1ml+UCRzfFHLxEdmX/+9r7
i1IFKqCVeQWBpWGITCrWoiLT3CuGbXjyFYh6DfD/cFN9vFEmDgjUk0P+oBZ6vj0U
Zevzf0aZ65yv31po8L3i3oesbXoqobSzVb+qJ430D4qlGj06bqFEqP5bxzdcJ7TC
7az4DNR4w88pwUlwTEs5YXRp+K2v9YSOWd75dCR89d2vgvTIuM8mxy/tfBJonX5x
tJdGBu0tFagrh4OHOCbqB/LtYxYhZf+qeMHoeVSru9ZjDWfPo4in4031w4UyCfME
YXjGv0gcicQ4MtN79AyiWe2ZxpIP/xBWjWegWXW3JTClMXWOrOb0EzbobmXglC1U
FDGiKo1BusiHnpSc5LZZ+aDJdoAKLZZeP5u0ofNjc0/y1entaeXpiXjE2jX0TTtN
cQkIa7xUphgQsyEAWDhW
=BJIA
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to