diff -Nru libpng1.6-1.6.20/debian/changelog libpng1.6-1.6.21/debian/changelog
--- libpng1.6-1.6.20/debian/changelog	2016-03-23 22:29:21.000000000 +0100
+++ libpng1.6-1.6.21/debian/changelog	2016-03-31 18:58:41.000000000 +0200
@@ -1,3 +1,19 @@
+libpng1.6 (1.6.21-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Team upload.
+  * Add upstream signing key
+  * Fix watch file.
+  * Update copyright file.
+  * Drop libpng16-devtools, useless and merged in libpng-dev.
+    (many packages relies on that script for building correctly)
+    - breaks + replaces accordingly.
+  * Remove multiarch -dev package
+  * Rename libpng16-tools to libpng-tools, there is no need of
+    strict versioning here.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 31 Mar 2016 14:43:03 +0200
+
 libpng1.6 (1.6.20-3) experimental; urgency=medium
 
   * Team upload
diff -Nru libpng1.6-1.6.20/debian/control libpng1.6-1.6.21/debian/control
--- libpng1.6-1.6.20/debian/control	2016-03-30 14:26:11.000000000 +0200
+++ libpng1.6-1.6.21/debian/control	2016-03-31 18:59:29.000000000 +0200
@@ -23,11 +23,10 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libpng16-16 (= ${binary:Version}), zlib1g-dev
-Breaks: libpng16-dev (<< 1.6.20-3)
+Breaks: libpng16-dev (<< 1.6.20-3), libpng16-devtools (<< 1.6.21-1)
 Conflicts: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev
-Replaces: libpng16-dev (<<1.6.20-3), libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev
-Recommends: libpng16-tools, libpng16-devtools
-Multi-Arch: same
+Replaces: libpng16-dev (<<1.6.20-3), libpng16-devtools (<< 1.6.21-1), libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev
+Recommends: libpng-tools
 Description: PNG library - development (version 1.6)
  libpng is a library implementing an interface for reading and writing
  PNG (Portable Network Graphics) format files.
@@ -35,26 +34,13 @@
  This package contains the header and development files needed to build
  programs and packages using libpng.
 
-Package: libpng16-devtools
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpng-dev (= ${binary:Version})
-Provides: libpng-devtools
-Conflicts: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev, libpng16-tools (<= 1.6.10-1)
-Replaces: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev
-Description: PNG library - devtools (version 1.6)
- libpng is a library implementing an interface for reading and writing
- PNG (Portable Network Graphics) format files.
- .
- This package contains tools needed to develop software using libpng.
-
-Package: libpng16-tools
+Package: libpng-tools
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libpng16-16 (= ${binary:Version})
-# Provides: libpng-tools
+Breaks: libpng16-tools (<< 1.6.21-1)
 Conflicts: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev
-Replaces: libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev
+Replaces: libpng16-tools (<< 1.6.21-1), libpng12-dev, libpng12-0-dev, libpng3-dev, libpng2-dev
 Description: PNG library - tools (version 1.6)
  libpng is a library implementing an interface for reading and writing
  PNG (Portable Network Graphics) format files.
diff -Nru libpng1.6-1.6.20/debian/copyright libpng1.6-1.6.21/debian/copyright
--- libpng1.6-1.6.20/debian/copyright	2016-03-23 22:06:57.000000000 +0100
+++ libpng1.6-1.6.21/debian/copyright	2016-03-31 14:55:30.000000000 +0200
@@ -3,7 +3,7 @@
 Source: http://www.libpng.org/pub/png/
 
 Files: *
-Copyright: Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson
+Copyright: Copyright (c) 1998-2016 Glenn Randers-Pehrson
 License: libpng
 
 Files: contrib/pngminus/*
@@ -11,7 +11,7 @@
 License: expat
 
 Files: contrib/tools/*
-Copyright: 2013 John Cunningham Bowler
+Copyright: 2013-2016 John Cunningham Bowler
 License: libpng
 
 Files: pngwutil.c pngstruct.h pngwrite.c pnginfo.h pngrio.c png.h
diff -Nru libpng1.6-1.6.20/debian/libpng16-devtools.install libpng1.6-1.6.21/debian/libpng16-devtools.install
--- libpng1.6-1.6.20/debian/libpng16-devtools.install	2015-11-18 18:53:43.000000000 +0100
+++ libpng1.6-1.6.21/debian/libpng16-devtools.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin/libpng16-config
-usr/bin/libpng-config
diff -Nru libpng1.6-1.6.20/debian/libpng16-devtools.links libpng1.6-1.6.21/debian/libpng16-devtools.links
--- libpng1.6-1.6.20/debian/libpng16-devtools.links	2015-11-18 18:53:43.000000000 +0100
+++ libpng1.6-1.6.21/debian/libpng16-devtools.links	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/share/man/man1/libpng16-config.1.gz /usr/share/man/man1/libpng-config.1.gz
diff -Nru libpng1.6-1.6.20/debian/libpng16-devtools.manpages libpng1.6-1.6.21/debian/libpng16-devtools.manpages
--- libpng1.6-1.6.20/debian/libpng16-devtools.manpages	2015-11-18 18:53:43.000000000 +0100
+++ libpng1.6-1.6.21/debian/libpng16-devtools.manpages	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/libpng16-config.1
diff -Nru libpng1.6-1.6.20/debian/libpng-dev.install libpng1.6-1.6.21/debian/libpng-dev.install
--- libpng1.6-1.6.20/debian/libpng-dev.install	2016-03-23 22:06:57.000000000 +0100
+++ libpng1.6-1.6.21/debian/libpng-dev.install	2016-03-31 18:19:31.000000000 +0200
@@ -1,3 +1,5 @@
+usr/bin/libpng-config
+usr/bin/libpng16-config
 usr/include
 usr/lib/*/pkgconfig
 usr/lib/*/libpng.a
diff -Nru libpng1.6-1.6.20/debian/libpng-dev.links libpng1.6-1.6.21/debian/libpng-dev.links
--- libpng1.6-1.6.20/debian/libpng-dev.links	2016-03-23 22:06:57.000000000 +0100
+++ libpng1.6-1.6.21/debian/libpng-dev.links	2016-03-31 18:20:00.000000000 +0200
@@ -1 +1,2 @@
 /usr/include/libpng16 /usr/include/libpng
+/usr/share/man/man1/libpng16-config.1.gz /usr/share/man/man1/libpng-config.1.gz
diff -Nru libpng1.6-1.6.20/debian/libpng-dev.manpages libpng1.6-1.6.21/debian/libpng-dev.manpages
--- libpng1.6-1.6.20/debian/libpng-dev.manpages	1970-01-01 01:00:00.000000000 +0100
+++ libpng1.6-1.6.21/debian/libpng-dev.manpages	2016-03-31 18:20:25.000000000 +0200
@@ -0,0 +1 @@
+debian/libpng16-config.1
diff -Nru libpng1.6-1.6.20/debian/libpng-tools.install libpng1.6-1.6.21/debian/libpng-tools.install
--- libpng1.6-1.6.20/debian/libpng-tools.install	1970-01-01 01:00:00.000000000 +0100
+++ libpng1.6-1.6.21/debian/libpng-tools.install	2016-03-31 18:55:01.000000000 +0200
@@ -0,0 +1,2 @@
+usr/bin/png-fix-itxt
+usr/bin/pngfix
diff -Nru libpng1.6-1.6.20/debian/upstream/signing-key.asc libpng1.6-1.6.21/debian/upstream/signing-key.asc
--- libpng1.6-1.6.20/debian/upstream/signing-key.asc	1970-01-01 01:00:00.000000000 +0100
+++ libpng1.6-1.6.21/debian/upstream/signing-key.asc	2016-03-31 14:41:46.000000000 +0200
@@ -0,0 +1,79 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+vJQ8QoDqu924IEkd6E6lNJNJxacDdQ==
+=6ylV
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru libpng1.6-1.6.20/debian/watch libpng1.6-1.6.21/debian/watch
--- libpng1.6-1.6.20/debian/watch	2015-11-18 18:53:43.000000000 +0100
+++ libpng1.6-1.6.21/debian/watch	2016-03-31 13:22:53.000000000 +0200
@@ -1,2 +1,3 @@
 version=3
-ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-([\d\.]+).tar.bz2 debian uupdate
+opts=pgpsigurlmangle=s/$/.asc/ \
+ ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-([\d\.]+).(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) debian uupdate