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

[Jackson Doak]

Merged from debian unstable

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-31 16:43:53 +0000
+++ debian/changelog	2013-08-22 06:15:37 +0000
@@ -1,3 +1,36 @@
+libpng (1.2.49-4ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian unstable. 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]>  Thu, 22 Aug 2013 16:05:43 +1000
+
+libpng (1.2.49-4) unstable; urgency=low
+
+  [ Andreas Beckmann ]
+  * libpng12-dev: Ship /usr/lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 ->
+    /lib/${DEB_HOST_MULTIARCH}/libpng12.so.0 symlink, too, to prevent ldconfig
+    from playing ping-pong with the SONAME link.  (Closes: #706181)
+
+ -- Anibal Monsalve Salazar <[e-mail]>  Fri, 26 Apr 2013 16:42:23 +1000
+
+libpng (1.2.49-3) unstable; urgency=low
+
+  * Remove patches/02-681408-CVE-2012-3386-Makefile.in.patch.
+    This patch is unnecessary. This issue is already fixed in automake.
+
+ -- Nobuhiro Iwamatsu <[e-mail]>  Tue, 28 Aug 2012 16:22:51 +0900
+
+libpng (1.2.49-2) unstable; urgency=high
+
+  * Change "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386
+    Add 02-681408-CVE-2012-3386-Makefile.in.patch
+    Closes: #681408
+
+ -- Anibal Monsalve Salazar <[e-mail]>  Fri, 13 Jul 2012 12:31:39 +1000
+
 libpng (1.2.49-1ubuntu2) raring; urgency=low
 
   * Add debian/tests: Simple compile/link/run autopkgtest. (LP: #1073538)

=== modified file 'debian/libpng12-dev.links.in'
--- debian/libpng12-dev.links.in	2011-07-27 12:44:46 +0000
+++ debian/libpng12-dev.links.in	2013-08-22 06:15:37 +0000
@@ -1,3 +1,4 @@
 /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
+/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