Use a generic name for libpng-dev dependency on Debian and Ubuntu

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 65ae0b5b2c)

debian/lenny/applications/digikam/debian/control

@@ -7,7 +7,7 @@ Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi B
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
+ libjasper-dev, libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4

debian/lenny/applications/digikam/debian/control.in

@@ -7,7 +7,7 @@ Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
+ libjasper-dev, libpng-dev, libexiv2-trinity-dev (>= 0.16),
  libkdcraw3-trinity-dev (>= 0.1.4),
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3

debian/lenny/dependencies/qt3/debian/control

@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
- libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
@@ -107,7 +107,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
  libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, uuid-dev,
  libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
- libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libpng-dev, libfontconfig1-dev, libfreetype6-dev,
  libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${binary:Version}),
  libqt3-headers (= ${binary:Version}), qt3-dev-tools (= ${binary:Version})

debian/lenny/dependencies/tqt3/debian/control

@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
- libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
@@ -100,7 +100,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
  libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, uuid-dev,
  libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
- libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libpng-dev, libfontconfig1-dev, libfreetype6-dev,
  libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
  libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})

debian/squeeze/applications/digikam/debian/control

@@ -7,7 +7,7 @@ Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi B
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
+ libjasper-dev, libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4

debian/squeeze/applications/digikam/debian/control.in

@@ -7,7 +7,7 @@ Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
+ libjasper-dev, libpng-dev, libexiv2-trinity-dev (>= 0.16),
  libkdcraw3-trinity-dev (>= 0.1.4),
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3

debian/squeeze/dependencies/qt3/debian/control

@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
- libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
@@ -107,7 +107,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
  libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, uuid-dev,
  libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
- libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libpng-dev, libfontconfig1-dev, libfreetype6-dev,
  libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${binary:Version}),
  libqt3-headers (= ${binary:Version}), qt3-dev-tools (= ${binary:Version})

debian/squeeze/dependencies/tqt3/debian/control

@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
- libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
@@ -100,7 +100,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
  libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, uuid-dev,
  libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
- libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libpng-dev, libfontconfig1-dev, libfreetype6-dev,
  libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
  libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})

ubuntu/maverick/applications/digikam/debian/control

@@ -7,7 +7,7 @@ Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi B
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
+ libjasper-dev, libpng-dev, libexiv2-dev,
  libkdcraw3-trinity-dev (>= 0.1.4),
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4

ubuntu/maverick/applications/digikam/debian/control.in

@@ -7,7 +7,7 @@ Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
+ libjasper-dev, libpng-dev, libexiv2-trinity-dev (>= 0.16),
  libkdcraw3-trinity-dev (>= 0.1.4),
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3

ubuntu/maverick/dependencies/qt3/debian/control

@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
- libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
@@ -107,7 +107,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
  libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, uuid-dev,
  libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
- libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libpng-dev, libfontconfig1-dev, libfreetype6-dev,
  libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${binary:Version}),
  libqt3-headers (= ${binary:Version}), qt3-dev-tools (= ${binary:Version})

ubuntu/maverick/dependencies/tqt3/debian/control

@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
- libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
@@ -100,7 +100,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
  libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, uuid-dev,
  libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
- libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libpng-dev, libfontconfig1-dev, libfreetype6-dev,
  libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
  libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})