Merge lp:~noskcaj/ubuntu/trusty/libpng/libpng into lp:ubuntu/trusty/libpng

[Jackson Doak]

Merge from debian testing

[Martin Pitt (pitti)]

THanks! Uploaded with s/saucy/trusty/ :-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-23 03:01:36 +0000
+++ debian/changelog	2013-10-21 20:04:30 +0000
@@ -1,3 +1,26 @@
+libpng (1.2.49-5ubuntu1) saucy; urgency=low
+
+  * Merge from Debian testing. Remaining changes:
+    - Revert to gzip compression for libpng12-0's data tarball. Packages in
+      the base system may not use bzip2.
+    - Add debian/tests: Simple compile/link/run autopkgtest
+
+ -- Jackson Doak <[e-mail]>  Tue, 22 Oct 2013 06:41:11 +1100
+
+libpng (1.2.49-5) unstable; urgency=low
+
+  [ Slávek Banko ]
+  * Ship /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 symlink
+    in libpng12-0, instead of libpng12-dev. (Closes: #713270)
+
+  [ Anibal Monsalve Salazar ]
+  * Standards-Version: 3.9.4
+  * Fix Lintian issue:
+    - libpng source: brace-expansion-in-debhelper-config-file
+      debian/libpng12-dev.install
+
+ -- Anibal Monsalve Salazar <[e-mail]>  Sun, 06 Oct 2013 10:31:53 +1100
+
 libpng (1.2.49-4ubuntu1) saucy; urgency=low
 
    * Merge from Debian unstable. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2012-10-31 16:43:53 +0000
+++ debian/control	2013-10-21 20:04:30 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Anibal Monsalve Salazar <[e-mail]>
 Uploaders: Nobuhiro Iwamatsu <[e-mail]>
 Build-Depends: debhelper (>= 8.1.3), libtool, automake, autoconf, zlib1g-dev, mawk
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://libpng.org/pub/png/libpng.html
 
 Package: libpng12-0

=== added file 'debian/libpng12-0.links.in'
--- debian/libpng12-0.links.in	1970-01-01 00:00:00 +0000
+++ debian/libpng12-0.links.in	2013-10-21 20:04:30 +0000
@@ -0,0 +1,1 @@
+/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0

=== modified file 'debian/libpng12-dev.install'
--- debian/libpng12-dev.install	2011-07-27 12:44:46 +0000
+++ debian/libpng12-dev.install	2013-10-21 20:04:30 +0000
@@ -1,4 +1,6 @@
 usr/include
 usr/lib/*/pkgconfig
-usr/lib/*/{libpng.a,libpng12.a,libpng.so}
+usr/lib/*/libpng.a
+usr/lib/*/libpng12.a
+usr/lib/*/libpng.so
 usr/bin

=== modified file 'debian/libpng12-dev.links.in'
--- debian/libpng12-dev.links.in	2013-08-22 06:12:13 +0000
+++ debian/libpng12-dev.links.in	2013-10-21 20:04:30 +0000
@@ -1,4 +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.0
 /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so

=== modified file 'debian/rules'
--- debian/rules	2012-05-24 10:13:23 +0000
+++ debian/rules	2013-10-21 20:04:30 +0000
@@ -46,7 +46,7 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
-	set -e; for file in libpng12-0.install libpng12-dev.links libpng3.links; \
+	set -e; for file in libpng12-0.install libpng12-0.links libpng12-dev.links libpng3.links; \
 	do \
 		sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
 			debian/$${file}.in > debian/$$file; \