[SCM] gmerlin-encoders/master: Re-generated debian/control and debian/copyright_hints

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 419a27a0042b204067363d2abe2aaaf925583d35
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Jan 18 11:58:19 2011 +0100

    Re-generated debian/control and debian/copyright_hints

diff --git a/debian/control b/debian/control
index a81dc73..07434dd 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.70~),
+Build-Depends: cdbs (>= 0.4.85),
  autotools-dev,
  gnulib,
  debhelper (>= 7.0.1),
@@ -30,7 +30,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gmerlin-encoders.git
 Package: gmerlin-encoders
 Architecture: any
 Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ gmerlin-encoders-ffmpeg,
+ gmerlin-encoders-flac,
+ gmerlin-encoders-ogg
 Description: 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
@@ -40,3 +43,52 @@ Description: encoders for gmerlin
  .
  This package includes a number of encoders to be used by Gmerlin,
  enabling gmerlin-transcoder to encode more file formats.
+
+Package: gmerlin-encoders-ffmpeg
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: gmerlin-encoders (<< 1.0.0-1)
+Breaks: gmerlin-encoders (<< 1.0.0-1)
+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
+ 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 ffmpeg based encoders to be used by Gmerlin,
+ enabling gmerlin-transcoder to encode more file formats.
+
+Package: gmerlin-encoders-flac
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: gmerlin-encoders (<< 1.0.0-1)
+Breaks: gmerlin-encoders (<< 1.0.0-1)
+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
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: gmerlin-encoders (<< 1.0.0-1)
+Breaks: gmerlin-encoders (<< 1.0.0-1)
+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
+ 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.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 08aec22..d0045d7 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -19,6 +19,17 @@ Files: ABOUT-NLS,
  cvs_clean.sh,
  debian/compat,
  debian/control,
+ debian/control.in,
+ debian/gbp.conf,
+ debian/gmerlin-encoders-ffmpeg.install,
+ debian/gmerlin-encoders-flac.install,
+ debian/gmerlin-encoders-ogg.install,
+ debian/patches/fix_typos.patch,
+ debian/patches/series,
+ debian/restorefiles,
+ debian/source/format,
+ debian/source/local-options,
+ debian/watch,
  gmerlin_encoders.spec.in,
  include/Makefile.am,
  include/config.h.in,
@@ -41,6 +52,7 @@ Files: ABOUT-NLS,
  po/POTFILES.in,
  po/Rules-quot,
  po/boldquot.sed,
+ po/de.gmo,
  po/en at boldquot.header,
  po/en at quot.header,
  po/insert-header.sin,
@@ -187,15 +199,13 @@ Copyright: 1996-1997, 1999-2000, 2002-2006
 License: GPL
  FIXME
 
-Files: debian/rules
-Copyright: 2010, Romain Beauxis <toots at rastageeks.org>,
- 2010-2011, Alessio Treglia <alessio at debian.org>,
- 2011, IOhannes m zmölnig <zmoelnig at iem.at>
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009 Free
 License: GPL
  FIXME
 
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
+Files: debian/rules
+Copyright: 2011, IOhannes m zmölnig <zmoelnig at iem.at>
 License: GPL
  FIXME
 

-- 
gmerlin-encoders packaging