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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0729cb0eb5a836fde95f0637dac05dda21aa31e2
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 10 16:47:05 2012 +0100

    Regenerate debian/control.
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 2498b31..069e3d4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Uploaders:
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.2
 Build-Depends:
- cdbs (>= 0.4.85~),
  autotools-dev,
  gnulib,
- debhelper (>= 7.0.1),
+ cdbs (>= 0.4.93~),
+ debhelper (>= 8.1.3~),
  libtool,
  automake1.11,
  autoconf,
@@ -31,7 +31,7 @@ Build-Depends:
  libpulse-dev,
  libquicktime-dev,
  libtiff4-dev,
- libv4l-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libv4l-dev [linux-any],
  libvisual-0.4-dev,
  libxml2-dev,
  libxv-dev,
@@ -46,7 +46,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
- gmerlin-plugins-avdecoder
+ gmerlin-plugins-avdecoder,
+ gmerlin-plugins-base
 Suggests:
  gmerlin-encoders
 Description: multiformat media player
@@ -71,6 +72,25 @@ Description: multiformat media player
   o Plugin configurator: Configure gmerlin plugins for programs which can't
     do this themselves.
 
+Package: gmerlin-plugins-base
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Breaks: gmerlin (<= 1.0.0~dfsg-12~)
+Replaces: gmerlin (<= 1.0.0~dfsg-12~)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Enhances: gmerlin
+Description: gmerlin plugins from the "base" set
+ Gmerlin is a multiformat media player with tree-like virtual directory
+ structure, where you can save your files, webstreams or whatever. It
+ handles even large media collections gracefully. Hardware devices appear
+ also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
+ DVB-broadcasts.
+ .
+ This package provides the gmerlin plugins from the "base" set.
+
 Package: gmerlin-doc
 Architecture: all
 Section: doc
@@ -87,9 +107,10 @@ Description: multiformat media player - documentation files
 
 Package: gmerlin-data
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
- ${misc:Depends},
- ${shlibs:Depends}
+ ${misc:Depends}
 Description: 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
@@ -101,6 +122,7 @@ Description: multiformat media player - data files
 
 Package: gmerlin-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Depends:
  gmerlin (= ${binary:Version}),
@@ -116,8 +138,10 @@ Description: debugging symbols for gmerlin
  This package contains the debugging symbols for gmerlin.
 
 Package: libgmerlin0
-Architecture: any
 Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -133,8 +157,10 @@ Description: core library for gmerlin - runtime files
  libgmerlin.
 
 Package: libgmerlin-common
-Architecture: any
 Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -154,8 +180,9 @@ Description: core library for gmerlin - common runtime files
  This package contains the common files needed by libgmerlin.
 
 Package: libgmerlin-dev
-Architecture: any
 Section: libdevel
+Architecture: any
+Multi-Arch: same
 Depends:
  libgavl-dev (>= 1.2.0),
  libgmerlin0 (= ${binary:Version}),

-- 
gmerlin packaging