[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-1-2-g1048096

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Fri Mar 13 10:21:51 UTC 2009


The following commit has been merged in the master branch:
commit 86e0297027daf68b6ca9ec370abce6343b2739d7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:33:52 2009 +0100

    merge Build-Depends-Indep with Build-Depends
    
    yes, this is a gross hack, as documentation shouldn't be built on !i386,
    but I have to admit that I don't get it. This commit needs to be
    reverted in a later update.

diff --git a/debian/control b/debian/control
index fc6d7e4..9c45efc 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,9 @@ Standards-Version: 3.8.0.0
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer.git;a=summary
 Homepage: http://www.mplayerhq.hu/
-Build-Depends-Indep: docbook-xml,
-		     docbook-xsl,
-		     xsltproc
 Build-Depends: debhelper (>= 7),
+	       docbook-xml,
+	       docbook-xsl,
 	       ladspa-sdk,
 	       libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 	       libaudio-dev,
@@ -40,8 +39,8 @@ Build-Depends: debhelper (>= 7),
 	       libncurses5-dev,
 	       libopenal-dev,
 	       libpng12-dev | libpng-dev,
-	       libpulse-dev,
 	       libpostproc-dev,
+	       libpulse-dev,
 	       libschroedinger-dev,
 	       libsdl1.2-dev | libsdl1.1-dev,
 	       libsmbclient-dev,
@@ -62,6 +61,7 @@ Build-Depends: debhelper (>= 7),
 	       quilt,
 	       vstream-client-dev,
 	       x11proto-core-dev,
+	       xsltproc,
 	       zlib1g-dev
 
 Package: mplayer

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list