[SCM] mplayer packaging branch, master, updated. upstream/1.0rc2+svn20090303-94-ge2d2116

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9183a94e8abd78de47e40b2daad64383441d9027
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 11 22:46:27 2009 +0100

    update debian/control.mplayer and control.mplayer-non-dfsg as well

diff --git a/debian/control.mplayer b/debian/control.mplayer
index 6d3d023..3fdc872 100644
--- a/debian/control.mplayer
+++ b/debian/control.mplayer
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 7),
 	       libavformat-dev,
 	       libavutil-dev,
 	       libcaca-dev,
-	       libcdparanoia0-dev,
+	       libcdparanoia-dev | libcdparanoia0-dev,
 	       libdirectfb-dev,
 	       libdts-dev,
 	       libdvdread-dev,
@@ -39,7 +39,7 @@ Build-Depends: debhelper (>= 7),
 	       libmpcdec-dev,
 	       libncurses5-dev,
 	       libopenal-dev,
-	       libpng-dev,
+	       libpng12-dev | libpng-dev,
 	       libpostproc-dev,
 	       libsdl1.2-dev | libsdl1.1-dev,
 	       libsmbclient-dev,
diff --git a/debian/control.mplayer-non-dfsg b/debian/control.mplayer-non-dfsg
index 6d3d023..3fdc872 100644
--- a/debian/control.mplayer-non-dfsg
+++ b/debian/control.mplayer-non-dfsg
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 7),
 	       libavformat-dev,
 	       libavutil-dev,
 	       libcaca-dev,
-	       libcdparanoia0-dev,
+	       libcdparanoia-dev | libcdparanoia0-dev,
 	       libdirectfb-dev,
 	       libdts-dev,
 	       libdvdread-dev,
@@ -39,7 +39,7 @@ Build-Depends: debhelper (>= 7),
 	       libmpcdec-dev,
 	       libncurses5-dev,
 	       libopenal-dev,
-	       libpng-dev,
+	       libpng12-dev | libpng-dev,
 	       libpostproc-dev,
 	       libsdl1.2-dev | libsdl1.1-dev,
 	       libsmbclient-dev,

-- 
mplayer packaging