[SCM] gmerlin-encoders/master: Re-generate

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 068b12cce1dcef1f9f7cdfbe3d83773ff00f5aea
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 18 14:39:21 2011 +0100

    Re-generate

diff --git a/debian/control b/debian/control
index f87e2d4..4c0ad68 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Alessio Treglia <alessio at debian.org>,
  IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.1
-Build-Depends: cdbs (>= 0.4.85),
+Build-Depends: cdbs (>= 0.4.70~),
  autotools-dev,
  gnulib,
  debhelper (>= 7.0.1),
@@ -27,10 +27,26 @@ Build-Depends: cdbs (>= 0.4.85),
 Vcs-Git: git://git.debian.org/pkg-multimedia/gmerlin-encoders.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gmerlin-encoders.git
 
+Package: gmerlin-encoders
+Architecture: all
+Recommends: gmerlin-encoders-flac,
+ gmerlin-encoders-ogg,
+ gmerlin-encoders-ffmpeg
+Description: patent-free encoders for gmerlin
+ 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 includes a good set of non-proprietary and patent-free
+ encoders to be used by Gmerlin.
+
 Package: gmerlin-encoders-ffmpeg
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
+Enhances: gmerlin
 Description: ffmpeg encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -45,6 +61,7 @@ Package: gmerlin-encoders-flac
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
+Enhances: gmerlin
 Description: flac encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -59,6 +76,7 @@ Package: gmerlin-encoders-ogg
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
+Enhances: gmerlin
 Description: ogg encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It

-- 
gmerlin-encoders packaging