[SCM] gmerlin/master: Regenerate debian/control.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9c8f58d72a3554e6825bc3065a7dc61e5264e9ec
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 23 18:52:21 2012 +0100

    Regenerate debian/control.
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index cce5b11..1fca56a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,13 @@ Source: gmerlin
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio at debian.org>,
+Uploaders:
+ Alessio Treglia <alessio at debian.org>,
  Romain Beauxis <toots at rastageeks.org>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.2
-Build-Depends: autotools-dev,
+Build-Depends:
+ autotools-dev,
  gnulib,
  cdbs (>= 0.4.85~),
  debhelper (>= 7.0.1),
@@ -15,37 +17,39 @@ Build-Depends: autotools-dev,
  automake1.11,
  autoconf,
  devscripts (>= 2.10.7~),
- libgavl-dev (>= 1.2.0),
- libcdio-paranoia-dev,
  doxygen,
- texinfo,
- libgtk2.0-dev,
- libxml2-dev,
  fontconfig,
+ libasound2-dev [linux-any],
  libcddb2-dev,
+ libcdio-paranoia-dev,
+ libesd0-dev,
  libfreetype6-dev,
+ libgavl-dev (>= 1.2.0),
  libglu1-mesa-dev,
- libesd0-dev,
- libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libxv-dev,
- libmusicbrainz4-dev,
+ libgtk2.0-dev,
+ libjack-dev,
+ libjpeg-dev,
  libpulse-dev,
+ libquicktime-dev,
  libtiff4-dev,
+ libv4l-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libvisual-0.4-dev,
- libjpeg-dev,
- libquicktime-dev,
- libjack-dev,
- libv4l-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+ libxml2-dev,
+ libxv-dev,
+ texinfo
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gmerlin.git
 Vcs-Git: git://git.debian.org/pkg-multimedia/gmerlin.git
 
 Package: gmerlin
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
+ gmerlin-data (>= ${source:Version}),
  ${misc:Depends},
- gmerlin-data (>= ${source:Version})
-Recommends: gmerlin-plugins-avdecoder
-Suggests: gmerlin-encoders
+ ${shlibs:Depends}
+Recommends:
+ gmerlin-plugins-avdecoder
+Suggests:
+ gmerlin-encoders
 Description: a multiformat media player
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -71,7 +75,8 @@ Description: a multiformat media player
 Package: gmerlin-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: a multiformat media player - documentation files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -83,8 +88,9 @@ Description: a multiformat media player - documentation files
 
 Package: gmerlin-data
 Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: a multiformat media player - data files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -97,7 +103,8 @@ Description: a multiformat media player - data files
 Package: gmerlin-dbg
 Architecture: any
 Section: debug
-Depends: gmerlin (= ${binary:Version}),
+Depends:
+ gmerlin (= ${binary:Version}),
  ${misc:Depends}
 Priority: extra
 Description: debugging symbols for gmerlin
@@ -112,8 +119,9 @@ Description: debugging symbols for gmerlin
 Package: libgmerlin0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: core library for gmerlin - runtime files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -127,10 +135,11 @@ Description: core library for gmerlin - runtime files
 Package: libgmerlin-dev
 Architecture: any
 Section: libdevel
-Depends: libgmerlin0 (= ${binary:Version}),
- pkg-config,
- libxml2-dev,
+Depends:
  libgavl-dev (>= 1.2.0),
+ libgmerlin0 (= ${binary:Version}),
+ libxml2-dev,
+ pkg-config,
  ${misc:Depends}
 Description: core library for gmerlin - development files
  Gmerlin is a multiformat media player with tree-like virtual directory
@@ -145,7 +154,8 @@ Description: core library for gmerlin - development files
 Package: libgmerlin-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: core library for gmerlin - documentation files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It

-- 
gmerlin packaging