[SCM] mplayer packaging branch, master, updated. upstream/0.svn20090303-68-gdae3a89

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e72f0454d9f8364f823ed076d386a9f248b9be12
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 22:24:43 2009 +0100

    rearrange debian/control handling
    
    add control file for 'mplayer' and 'mplayer-non-dfsg' variants
    and remove now unnused debian/control.in file

diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index fc291d1..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,62 +0,0 @@
-Source: @MPLAYER@
-Section: graphics
-Priority: optional
-Maintainer:  A Mennucc1 <mennucc1 at debian.org>
-Standards-Version: 3.8.0.0
-Vcs-Browser: http://svn.mplayerhq.hu/mplayer/trunk/
-Vcs-Svn: svn://svn.mplayerhq.hu/mplayer
-Homepage: http://www.mplayerhq.hu/
-Build-Depends-Indep: @DOCDEP@
-Build-Conflicts: gcc-4.3 (<= 4.3.0-3), libavcodec-dev (>= 0.svn20080207)
-Build-Depends: debhelper (>= 4), dpatch, make (>= 3.80), pkg-config, po-debconf,
- libsdl1.2-dev | libsdl1.1-dev, libsvga1-dev [i386 amd64],
- libdts-dev, ladspa-sdk, vstream-client-dev,
- libpng-dev, libncurses5-dev, zlib1g-dev, libspeex-dev, libsmbclient-dev,
- libtheora-dev (>= 1.0~beta1-1), libesd0-dev, liblzo2-dev, libgl1-mesa-dev,
- libasound2-dev (>= 1.0.6-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaudio-dev, libfribidi-dev, libopenal-dev, libmpcdec-dev,
- libvorbis-dev, liblircclient-dev, libfreetype6-dev, libdvdread-dev, 
- libcdparanoia0-dev, libfontconfig1-dev, libjpeg62-dev, libgif-dev,
- libgtk2.0-dev, libdirectfb-dev, libcaca-dev, liblivemedia-dev, libjack-dev, 
- libavcodec-dev (>= 0.svn20080206),  
- libavdevice-dev, libavformat-dev,   libavutil-dev,
- libpostproc-dev,   libswscale-dev,  @XLIBS@, @EXTRA_BUILDDEP@
-
-Package: @MPLAYER@
-Architecture: any
-Suggests: mplayer-doc, ttf-freefont, netselect | fping, bzip2, fontconfig
-Depends: ${shlibs:Depends}, debconf | debconf-2.0, mplayer-skin
-Description: movie player for Unix-like systems
- MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
- ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
- supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
- also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
- .
- Another big feature of MPlayer is the wide range of supported output
- drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
- DirectFB, but also SDL (plus all its drivers) and some
- low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
- and Permedia3). Most of them support software or hardware scaling,
- therefore allowing fullscreen display.  MPlayer is also able
- to use some hardware MPEG decoder boards, such as the DVB
- and DXR3/Hollywood+. @DFSG@
- .
- Not all of the upstream code is distributed in the source tarball.
- See the README.Debian and copyright files for details.
-
-Package: @MPLAYER at -dbg
-Architecture: any
-Priority: extra
-Depends: mplayer
-Description: debugging symbols for MPlayer
- This package contains the debugging symbols for MPlayer, a movie
- player for Unix-like systems. You only need these if you want to
- generate debugging backtraces.
-
-Package: @MPLAYER at -doc
-Architecture: all
-Recommends: mplayer
-Section: doc
-Description: documentation for MPlayer
- This package contains the documentation for MPlayer, a movie player for
- Unix-like systems.
diff --git a/debian/control b/debian/control.mplayer
similarity index 97%
copy from debian/control
copy to debian/control.mplayer
index f3fc65d..ade1efe 100644
--- a/debian/control
+++ b/debian/control.mplayer
@@ -8,7 +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;a=summary
 Homepage: http://www.mplayerhq.hu/
-Build-Depends-Indep: 
+Build-Depends-Indep: docbook-xml,
+		     docbook-xsl,
+		     xsltproc
 Build-Depends: debhelper (>= 7),
 	       ladspa-sdk,
 	       libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/debian/control b/debian/control.mplayer-non-dfsg
similarity index 97%
copy from debian/control
copy to debian/control.mplayer-non-dfsg
index f3fc65d..ade1efe 100644
--- a/debian/control
+++ b/debian/control.mplayer-non-dfsg
@@ -8,7 +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;a=summary
 Homepage: http://www.mplayerhq.hu/
-Build-Depends-Indep: 
+Build-Depends-Indep: docbook-xml,
+		     docbook-xsl,
+		     xsltproc
 Build-Depends: debhelper (>= 7),
 	       ladspa-sdk,
 	       libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],

-- 
mplayer packaging