[SCM] gmerlin-encoders/master: This should be the final change:

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8afc7badb23d75ea1d812adfd1342a1cb4cd3f62
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 18 20:06:16 2011 +0100

    This should be the final change:
    
     * gmerlin-encoders-good contains the patent-free Ogg/Vorbis, Theora, FLAC and speex encoders.
       It isn't worth to set a binary package for each encoder.
     * gmerlin-encoders-ffmpeg contains the FFmpeg encoding support.
    
    The old gmerlin-encoders{,-{flac,good} have been replaced by the above binaries.

diff --git a/debian/control.in b/debian/control.in
index 037552e..4fdb37b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -22,21 +22,6 @@ Build-Depends: @cdbs@,
 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},
@@ -52,33 +37,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.
diff --git a/debian/gmerlin-encoders-flac.install b/debian/gmerlin-encoders-flac.install
deleted file mode 100644
index 706caa6..0000000
--- a/debian/gmerlin-encoders-flac.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/gmerlin/plugins/e_flac.so
diff --git a/debian/gmerlin-encoders-ogg.install b/debian/gmerlin-encoders-good.install
similarity index 80%
rename from debian/gmerlin-encoders-ogg.install
rename to debian/gmerlin-encoders-good.install
index 8086935..917ac57 100644
--- a/debian/gmerlin-encoders-ogg.install
+++ b/debian/gmerlin-encoders-good.install
@@ -2,3 +2,4 @@ debian/tmp/usr/lib/gmerlin/plugins/e_flacogg.so
 debian/tmp/usr/lib/gmerlin/plugins/e_speex.so
 debian/tmp/usr/lib/gmerlin/plugins/e_theora.so
 debian/tmp/usr/lib/gmerlin/plugins/e_vorbis.so
+debian/tmp/usr/lib/gmerlin/plugins/e_flac.so

-- 
gmerlin-encoders packaging