[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.5.5-3-5-gb29c3df

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 5f4b387599a552b09c5dd433f9d2840173405370
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Mar 17 23:23:08 2012 +0100

    Drop libpng12-dev build-dependency entirely.

diff --git a/debian/changelog b/debian/changelog
index 6a915d0..ba8e7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ stella (3.6-1) unstable; urgency=low
   * New upstream version.
   * Update documentation with new features in 3.6, notably CompuMate
     emulation and 2600-daptor II support.
+  * Drop libpng12-dev build-dependency entirely (in favour of
+    libpng-dev).
 
  -- Stephen Kitt <steve at sk2.org>  Sat, 17 Mar 2012 13:37:20 +0100
 
diff --git a/debian/control b/debian/control
index bf373d3..973cbd2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
 Build-Depends: autotools-dev,
                debhelper (>= 8.1.0~),
-               libpng12-dev | libpng-dev,
+               libpng-dev,
                libsdl1.2-dev,
                zlib1g-dev
 Homepage: http://stella.sf.net

-- 
Atari 2600 Emulator for SDL & the X Window System