[SCM] Qt 4 packaging branch, master, updated. debian/4.7.4-2-2-g04b988e

[Pino Toscano]

The following commit has been merged in the master branch:
commit 04b988ed7efbf4a3ba7c0a4033849158410ac2b3
Author: Pino Toscano <pino at debian.org>
Date:   Mon Mar 5 15:43:14 2012 +0100

    switch the libpng12-dev build dependency to libpng-dev (#662484)
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bfe152..3255335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qt4-x11 (4:4.7.4-3) UNRELEASED; urgency=low
 
   * Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
 
+  [ Pino Toscano ]
+  * Switch the libpng12-dev build dependency to libpng-dev. (Closes: #662484)
+
  -- Fathi Boudra <fabo at debian.org>  Fri, 06 Jan 2012 21:54:25 +0200
 
 qt4-x11 (4:4.7.4-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ca5cda4..9a77efc 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 7.4.13),
                libmng-dev,
                libmysqlclient-dev,
                libpam0g-dev,
-               libpng12-dev,
+               libpng-dev,
                libpq-dev,
                libreadline-dev,
                libsm-dev,

-- 
Qt 4 packaging