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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 83db360d3d5738d49af260a12189e759a9ff57bd
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 18 20:12:53 2011 +0100

    Re-generate

diff --git a/debian/control b/debian/control
index 4c0ad68..7580d69 100644
--- a/debian/control
+++ b/debian/control
@@ -27,21 +27,6 @@ Build-Depends: cdbs (>= 0.4.70~),
 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},
@@ -57,33 +42,17 @@ Description: ffmpeg encoders for Gmerlin
  This package includes ffmpeg based encoders to be used by Gmerlin,
  enabling gmerlin-transcoder to encode more file formats.
 
-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
- 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 flac based encoders to be used by Gmerlin,
- enabling gmerlin-transcoder to encode more file formats.
-
-Package: gmerlin-encoders-ogg
+Package: gmerlin-encoders-good
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Enhances: gmerlin
-Description: ogg encoders for Gmerlin
+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 ogg based encoders (flac, speex, theora, vorbis) 
- to be used by Gmerlin, enabling gmerlin-transcoder to encode more file
- formats.
+ This package includes the "good" set of Gmerlin's plugins, which
+ contains only non-proprietary and patent-free encoders.

-- 
gmerlin-encoders packaging