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

[mennucc1 at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 13d333fa45441b1c0e6aab4f5e08a4b89e7223af
Author: Andrea Mennucc <mennucc1 at debian.org>
Date:   Sun Mar 22 15:47:58 2009 +0100

    have debian/control   debian/control.mplayer
     debian/control.mplayer-non-dfsg in sync

diff --git a/debian/control b/debian/control
index 8ec87d1..3eb9e97 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,10 @@ 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,
@@ -39,8 +40,8 @@ Build-Depends: debhelper (>= 7),
 	       libncurses5-dev,
 	       libopenal-dev,
 	       libpng12-dev | libpng-dev,
-	       libpostproc-dev,
 	       libpulse-dev,
+	       libpostproc-dev,
 	       libschroedinger-dev,
 	       libsdl1.2-dev | libsdl1.1-dev,
 	       libsmbclient-dev,
@@ -61,7 +62,6 @@ Build-Depends: debhelper (>= 7),
 	       quilt,
 	       vstream-client-dev,
 	       x11proto-core-dev,
-	       xsltproc,
 	       zlib1g-dev
 
 Package: mplayer
@@ -106,8 +106,8 @@ Description: debugging symbols for MPlayer
 
 Package: mplayer-doc
 Architecture: all
-Recommends: mplayer
 Section: doc
+Recommends: mplayer
 Depends: ${misc:Depends}
 Description: documentation for MPlayer
  This package contains the documentation for MPlayer, a movie player for
diff --git a/debian/control.mplayer b/debian/control.mplayer
index aa2dad7..3eb9e97 100644
--- a/debian/control.mplayer
+++ b/debian/control.mplayer
@@ -1,5 +1,5 @@
 Source: mplayer
-Section: graphics
+Section: video
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: A Mennucc1 <mennucc1 at debian.org>,
@@ -66,6 +66,7 @@ Build-Depends: debhelper (>= 7),
 
 Package: mplayer
 Architecture: any
+Section: video
 Suggests: mplayer-doc,
 	  ttf-freefont,
 	  netselect | fping,
@@ -95,6 +96,7 @@ Description: movie player for Unix-like systems
 
 Package: mplayer-dbg
 Architecture: any
+Section: debug
 Priority: extra
 Depends: mplayer, ${misc:Depends}
 Description: debugging symbols for MPlayer
@@ -104,9 +106,9 @@ Description: debugging symbols for MPlayer
 
 Package: mplayer-doc
 Architecture: all
+Section: doc
 Recommends: mplayer
 Depends: ${misc:Depends}
-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.mplayer-non-dfsg b/debian/control.mplayer-non-dfsg
index aa2dad7..3eb9e97 100644
--- a/debian/control.mplayer-non-dfsg
+++ b/debian/control.mplayer-non-dfsg
@@ -1,5 +1,5 @@
 Source: mplayer
-Section: graphics
+Section: video
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: A Mennucc1 <mennucc1 at debian.org>,
@@ -66,6 +66,7 @@ Build-Depends: debhelper (>= 7),
 
 Package: mplayer
 Architecture: any
+Section: video
 Suggests: mplayer-doc,
 	  ttf-freefont,
 	  netselect | fping,
@@ -95,6 +96,7 @@ Description: movie player for Unix-like systems
 
 Package: mplayer-dbg
 Architecture: any
+Section: debug
 Priority: extra
 Depends: mplayer, ${misc:Depends}
 Description: debugging symbols for MPlayer
@@ -104,9 +106,9 @@ Description: debugging symbols for MPlayer
 
 Package: mplayer-doc
 Architecture: all
+Section: doc
 Recommends: mplayer
 Depends: ${misc:Depends}
-Section: doc
 Description: documentation for MPlayer
  This package contains the documentation for MPlayer, a movie player for
  Unix-like systems.

-- 
mplayer packaging