The following commit has been merged in the master branch:
commit f65de36150a501ac6464406b1f6fb1e240c86f03
Author: Stephen Kitt <st...@sk2.org>
Date:   Tue Mar 6 00:27:57 2012 +0100

    Allow building with libpng-dev (closes: #662511).

diff --git a/debian/changelog b/debian/changelog
index 53b94ab..b87bec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+stella (3.5.5-3) unstable; urgency=low
+
+  * Allow building with libpng-dev (closes: #662511); stella is known to
+    build with libpng 1.5 so this shouldn't cause trouble when libpng-
+    dev switches to 1.5.
+
+ -- Stephen Kitt <st...@sk2.org>  Tue, 06 Mar 2012 00:08:53 +0100
+
 stella (3.5.5-2) unstable; urgency=low
 
   * Use maintscript support in dh_installdeb rather than writing out
diff --git a/debian/control b/debian/control
index 30949d0..0e41d2f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,11 @@ Maintainer: Debian Games Team 
<pkg-games-de...@lists.alioth.debian.org>
 Uploaders: Stephen Kitt <st...@sk2.org>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8.1.0~), libsdl1.2-dev, zlib1g-dev, libpng12-dev, 
autotools-dev
+Build-Depends: autotools-dev,
+               debhelper (>= 8.1.0~),
+               libpng12-dev | libpng-dev,
+               libsdl1.2-dev,
+               zlib1g-dev
 Homepage: http://stella.sf.net
 Vcs-Git: git://git.debian.org/git/pkg-games/stella.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/stella.git
@@ -13,7 +17,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/stella.git
 Package: stella
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Atari 2600 Emulator for SDL & the X Window System
  Stella is a portable emulator of the old Atari 2600 video-game
  console. You can play most Atari 2600 games with it.

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

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to