[SCM] gmerlin-encoders/master: Regenerated

Mon Jun 11 15:39:47 UTC 2012

The following commit has been merged in the master branch:
commit 34c95e3b80e1402fe67f620ad54e1a0ed58c465d
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 17:33:50 2012 +0200

    Regenerated

diff --git a/debian/control b/debian/control
index 0318c22..12e1378 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,15 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 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.2
-Build-Depends: autotools-dev,
+Standards-Version: 3.9.3
+Build-Depends: cdbs (>= 0.4.70~),
+ autotools-dev,
  gnulib,
- cdbs (>= 0.4.85~),
- debhelper (>= 7.0.1),
+ debhelper,
  dh-buildinfo,
- devscripts (>= 2.10.7~),
+ devscripts,
  libgavl-dev (>= 1.2.0),
- libgmerlin-dev (>= 1.0.0~),
+ libgmerlin-dev (>= 1.2.0~),
  libflac-dev,
  libogg-dev,
  libvorbis-dev,
diff --git a/debian/copyright_hints b/debian/copyright_hints
index d0045d7..7880c06 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,246 +1,240 @@
-Format: http://bzr.debian.org/scm/loggerhead/dep/dep5/trunk/annotate/132/dep5.mdwn
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FIXME
 Upstream-Contact: FIXME
 Source: FIXME
-Copyright: FIXME
-Disclaimer: Autogenerated by CDBS snippet copyright-check.mk
+Disclaimer: Autogenerated by CDBS
 
-Files: ABOUT-NLS,
- AUTHORS,
- ChangeLog,
- INSTALL,
- Makefile.am,
- NEWS,
- README,
- acinclude.m4,
- autogen.sh,
- configure.ac,
- cpuinfo.sh,
- 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,
- lib/Makefile.am,
- m4/Makefile.am,
- m4/avcodec.m4,
- m4/avformat.m4,
- m4/check_funcs.m4,
- m4/lqt_opt_cflags.m4,
- make_potfiles,
- plugins/Makefile.am,
- plugins/faac/Makefile.am,
- plugins/ffmpeg/Makefile.am,
- plugins/flac/Makefile.am,
- plugins/lame/Makefile.am,
- plugins/ogg/Makefile.am,
- plugins/yuv4mpeg/Makefile.am,
- po/ChangeLog,
- po/LINGUAS,
- 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,
- po/quot.sed,
- po/remove-potcdate.sin,
- po/stamp-po,
- utils/Makefile.am,
+Files: ABOUT-NLS
+ AUTHORS
+ ChangeLog
+ INSTALL
+ Makefile.am
+ NEWS
+ README
+ acinclude.m4
+ autogen.sh
+ configure.ac
+ cpuinfo.sh
+ cvs_clean.sh
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/gbp.conf
+ debian/gmerlin-encoders-ffmpeg.install
+ debian/gmerlin-encoders-good.install
+ debian/patches/fix_typos.patch
+ debian/patches/libav.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
+ lib/Makefile.am
+ m4/Makefile.am
+ m4/avcodec.m4
+ m4/avformat.m4
+ m4/check_funcs.m4
+ m4/lqt_opt_cflags.m4
+ make_potfiles
+ plugins/Makefile.am
+ plugins/faac/Makefile.am
+ plugins/ffmpeg/Makefile.am
+ plugins/flac/Makefile.am
+ plugins/lame/Makefile.am
+ plugins/ogg/Makefile.am
+ plugins/yuv4mpeg/Makefile.am
+ po/ChangeLog
+ po/LINGUAS
+ 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
+ po/quot.sed
+ po/remove-potcdate.sin
+ po/stamp-po
+ utils/Makefile.am
  utils/cpuinfo.c
 Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: include/bgflac.h,
- include/bgshout.h,
- include/gmerlin_encoders.h,
- lib/bgflac.c,
- lib/bgshout.c,
- lib/id3v1.c,
- lib/id3v2.c,
- plugins/faac/e_faac.c,
- plugins/ffmpeg/codecs.c,
- plugins/ffmpeg/e_ffmpeg.c,
- plugins/ffmpeg/e_ffmpeg_audio.c,
- plugins/ffmpeg/e_ffmpeg_video.c,
- plugins/ffmpeg/ffmpeg_common.c,
- plugins/ffmpeg/ffmpeg_common.h,
- plugins/ffmpeg/params.h,
- plugins/flac/e_flac.c,
- plugins/lame/e_lame.c,
- plugins/lame/xing.c,
- plugins/lame/xing.h,
- plugins/ogg/b_ogg.c,
- plugins/ogg/e_flacogg.c,
- plugins/ogg/e_speex.c,
- plugins/ogg/e_theora.c,
- plugins/ogg/e_vorbis.c,
- plugins/ogg/flac.c,
- plugins/ogg/ogg_common.c,
- plugins/ogg/ogg_common.h,
- plugins/ogg/speex.c,
- plugins/ogg/theora.c,
- plugins/ogg/vorbis.c,
- plugins/yuv4mpeg/e_mpeg.c,
- plugins/yuv4mpeg/e_mpegaudio.c,
- plugins/yuv4mpeg/e_mpegvideo.c,
- plugins/yuv4mpeg/e_yuv4mpeg.c,
- plugins/yuv4mpeg/mpa_common.c,
- plugins/yuv4mpeg/mpa_common.h,
- plugins/yuv4mpeg/mpv_common.c,
- plugins/yuv4mpeg/mpv_common.h,
- plugins/yuv4mpeg/y4m_common.c,
+Files: include/bgflac.h
+ include/bgshout.h
+ include/gmerlin_encoders.h
+ lib/bgflac.c
+ lib/bgshout.c
+ lib/id3v1.c
+ lib/id3v2.c
+ plugins/faac/e_faac.c
+ plugins/ffmpeg/codecs.c
+ plugins/ffmpeg/e_ffmpeg.c
+ plugins/ffmpeg/e_ffmpeg_audio.c
+ plugins/ffmpeg/e_ffmpeg_video.c
+ plugins/ffmpeg/ffmpeg_common.c
+ plugins/ffmpeg/ffmpeg_common.h
+ plugins/ffmpeg/params.h
+ plugins/flac/e_flac.c
+ plugins/lame/b_lame.c
+ plugins/lame/bglame.c
+ plugins/lame/bglame.h
+ plugins/lame/e_lame.c
+ plugins/lame/xing.c
+ plugins/lame/xing.h
+ plugins/ogg/b_ogg.c
+ plugins/ogg/e_flacogg.c
+ plugins/ogg/e_speex.c
+ plugins/ogg/e_theora.c
+ plugins/ogg/e_vorbis.c
+ plugins/ogg/flac.c
+ plugins/ogg/ogg_common.c
+ plugins/ogg/ogg_common.h
+ plugins/ogg/speex.c
+ plugins/ogg/theora.c
+ plugins/ogg/vorbis.c
+ plugins/yuv4mpeg/e_mpeg.c
+ plugins/yuv4mpeg/e_mpegaudio.c
+ plugins/yuv4mpeg/e_mpegvideo.c
+ plugins/yuv4mpeg/e_yuv4mpeg.c
+ plugins/yuv4mpeg/mpa_common.c
+ plugins/yuv4mpeg/mpa_common.h
+ plugins/yuv4mpeg/mpv_common.c
+ plugins/yuv4mpeg/mpv_common.h
+ plugins/yuv4mpeg/y4m_common.c
  plugins/yuv4mpeg/y4m_common.h
 Copyright: 2001, - 2011, Members of the Gmerlin project
 License: GPL-2+
  FIXME
 
-Files: config.rpath,
- m4/codeset.m4,
- m4/gettext.m4,
- m4/glibc2.m4,
- m4/glibc21.m4,
- m4/iconv.m4,
- m4/intdiv0.m4,
- m4/intmax.m4,
- m4/inttypes-h.m4,
- m4/inttypes-pri.m4,
- m4/inttypes_h.m4,
- m4/lcmessage.m4,
- m4/lib-ld.m4,
- m4/lib-link.m4,
- m4/lib-prefix.m4,
- m4/lock.m4,
- m4/longdouble.m4,
- m4/longlong.m4,
- m4/nls.m4,
- m4/po.m4,
- m4/printf-posix.m4,
- m4/progtest.m4,
- m4/signed.m4,
- m4/size_max.m4,
- m4/stdint_h.m4,
- m4/uintmax_t.m4,
- m4/ulonglong.m4,
- m4/visibility.m4,
- m4/wchar_t.m4,
- m4/wint_t.m4,
+Files: config.rpath
+ m4/codeset.m4
+ m4/gettext.m4
+ m4/glibc2.m4
+ m4/glibc21.m4
+ m4/iconv.m4
+ m4/intdiv0.m4
+ m4/intmax.m4
+ m4/inttypes-h.m4
+ m4/inttypes-pri.m4
+ m4/inttypes_h.m4
+ m4/lcmessage.m4
+ m4/lib-ld.m4
+ m4/lib-link.m4
+ m4/lib-prefix.m4
+ m4/lock.m4
+ m4/longdouble.m4
+ m4/longlong.m4
+ m4/nls.m4
+ m4/po.m4
+ m4/printf-posix.m4
+ m4/progtest.m4
+ m4/signed.m4
+ m4/size_max.m4
+ m4/stdint_h.m4
+ m4/uintmax_t.m4
+ m4/ulonglong.m4
+ m4/visibility.m4
+ m4/wchar_t.m4
+ m4/wint_t.m4
  m4/xsize.m4
-Copyright: 1995-2002, 2004-2005, Free Software Foundation, Inc,
- 1995-2003, 2005-2006, Free Software Foundation, Inc,
- 1995-2006, Free Software Foundation, Inc,
- 1996-2003, 2005 Free Software Foundation, Inc,
- 1996-2003, Free Software Foundation, Inc,
- 1996-2006, Free Software Foundation, Inc,
- 1997-2002, 2006 Free Software Foundation, Inc,
- 1997-2004, Free Software Foundation, Inc,
- 1999-2004, Free Software Foundation, Inc,
- 2000-2002, 2004 Free Software Foundation, Inc,
- 2000-2002, Free Software Foundation, Inc,
- 2001-2002, Free Software Foundation, Inc,
- 2001-2005, Free Software Foundation, Inc,
- 2001-2006, Free Software Foundation, Inc,
- 2002, Free Software Foundation, Inc,
- 2002-2003, 2006 Free Software Foundation, Inc,
- 2002-2003, Free Software Foundation, Inc,
- 2002-2005, Free Software Foundation, Inc,
- 2003, 2005-2006, Free Software Foundation, Inc,
- 2003, Free Software Foundation, Inc,
- 2003-2004, Free Software Foundation, Inc,
- 2005, Free Software Foundation, Inc
+Copyright: 1995-2002, 2004-2005, Free Software Foundation, Inc
+  1995-2003, 2005-2006, Free Software Foundation, Inc
+  1995-2006, Free Software Foundation, Inc
+  1996-2003, 2005 Free Software Foundation, Inc
+  1996-2003, Free Software Foundation, Inc
+  1996-2006, Free Software Foundation, Inc
+  1997-2002, 2006 Free Software Foundation, Inc
+  1997-2004, Free Software Foundation, Inc
+  1999-2004, Free Software Foundation, Inc
+  2000-2002, 2004 Free Software Foundation, Inc
+  2000-2002, Free Software Foundation, Inc
+  2001-2002, Free Software Foundation, Inc
+  2001-2005, Free Software Foundation, Inc
+  2001-2006, Free Software Foundation, Inc
+  2002, Free Software Foundation, Inc
+  2002-2003, 2006 Free Software Foundation, Inc
+  2002-2003, Free Software Foundation, Inc
+  2002-2005, Free Software Foundation, Inc
+  2003, 2005-2006, Free Software Foundation, Inc
+  2003, Free Software Foundation, Inc
+  2003-2004, Free Software Foundation, Inc
+  2005, Free Software Foundation, Inc
 License: UNKNOWN
  FIXME
 
-Files: Makefile.in,
- include/Makefile.in,
- lib/Makefile.in,
- m4/Makefile.in,
- plugins/Makefile.in,
- plugins/faac/Makefile.in,
- plugins/ffmpeg/Makefile.in,
- plugins/flac/Makefile.in,
- plugins/lame/Makefile.in,
- plugins/ogg/Makefile.in,
- plugins/yuv4mpeg/Makefile.in,
+Files: Makefile.in
+ include/Makefile.in
+ lib/Makefile.in
+ m4/Makefile.in
+ plugins/Makefile.in
+ plugins/faac/Makefile.in
+ plugins/ffmpeg/Makefile.in
+ plugins/flac/Makefile.in
+ plugins/lame/Makefile.in
+ plugins/ogg/Makefile.in
+ plugins/yuv4mpeg/Makefile.in
  utils/Makefile.in
 Copyright: 1994-2002
 License: UNKNOWN
  FIXME
 
-Files: config.guess,
+Files: config.guess
  config.sub
-Copyright: 1992-1999,,
- 1992-2001
+ missing
+Copyright: 1992-1999,
+  1992-2001
+  1996-1997, 1999-2000, 2002-2006
 License: GPL-2+
  FIXME
 
-Files: po/de.po,
+Files: po/de.po
  po/gmerlin-encoders.pot
 Copyright: YEAR Members of the gmerlin project
 License: UNKNOWN
  FIXME
 
-Files: missing
-Copyright: 1996-1997, 1999-2000, 2002-2006
-License: GPL
- FIXME
-
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
-License: GPL
- FIXME
-
-Files: debian/rules
-Copyright: 2011, IOhannes m zmölnig <zmoelnig at iem.at>
-License: GPL
- FIXME
-
 Files: configure
-Copyright: (ISLOWER ? 'A' + ( - 'a') : ),
- (ISLOWER ? ( | 0x40) : ),
- 1992-1996, 1998-2001,,
- 1996-2001, 2003-2005,
- 2009, Free Software Foundation, Inc
+Copyright: (ISLOWER ? 'A' + ( - 'a') : )
+  (ISLOWER ? ( | 0x40) : )
+  1992-1996, 1998-2001,
+  1996-2001, 2003-2005
+  2009, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: aclocal.m4
-Copyright: 1996-1997, 2000-2001, 2003, 2005,,
- 1996-1997, 2000-2001, 2003, 2005, 2008,
- 1996-2001, 2003-2005,
- 1996-2004,,
- 1997, 1999-2001, 2003-2005, 2008,
- 1997, 2000-2001, 2003-2006, 2008,
- 1999-2005, 2008,
- 1999-2006, 2009,
- 2001, 2003, 2005, 2008 Free Software Foundation, Inc,
- 2001, 2003, 2005, Free Software Foundation, Inc,
- 2001-2003, 2005, 2008, Free Software Foundation, Inc,
- 2001-2003, 2005, 2009, Free Software Foundation, Inc,
- 2002-2003, 2005-2008, Free Software Foundation, Inc,
- 2003, 2005 Free Software Foundation, Inc,
- 2003-2006, Free Software Foundation, Inc,
- 2004, Free Software Foundation, Inc,
- 2004, Scott James Remnant <scott at netsplit.com>,
- 2004-2005, 2007 Free Software Foundation, Inc,
- 2004-2005, 2007-2008, Free Software Foundation, Inc,
- 2004-2005, Free Software Foundation, Inc,
- 2006, 2008 Free Software Foundation, Inc,
- 2008, Free Software Foundation, Inc
+Copyright: 1996-1997, 2000-2001, 2003, 2005,
+  1996-1997, 2000-2001, 2003, 2005, 2008
+  1996-2001, 2003-2005
+  1996-2004,
+  1997, 1999-2001, 2003-2005, 2008
+  1997, 2000-2001, 2003-2006, 2008
+  1999-2005, 2008
+  1999-2006, 2009
+  2001, 2003, 2005, 2008 Free Software Foundation, Inc
+  2001, 2003, 2005, Free Software Foundation, Inc
+  2001-2003, 2005, 2008, Free Software Foundation, Inc
+  2001-2003, 2005, 2009, Free Software Foundation, Inc
+  2002-2003, 2005-2008, Free Software Foundation, Inc
+  2003, 2005 Free Software Foundation, Inc
+  2003-2006, Free Software Foundation, Inc
+  2004, Free Software Foundation, Inc
+  2004, Scott James Remnant <scott at netsplit.com>
+  2004-2005, 2007 Free Software Foundation, Inc
+  2004-2005, 2007-2008, Free Software Foundation, Inc
+  2004-2005, Free Software Foundation, Inc
+  2006, 2008 Free Software Foundation, Inc
+  2008, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009 Free
 License: GPL-2+
  FIXME
 
@@ -249,29 +243,34 @@ Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
+Files: debian/rules
+Copyright: 2011, IOhannes m zmölnig <zmoelnig at iem.at>
+License: GPL-2+
+ FIXME
+
 Files: COPYING
-Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>,
- <year> <name of author>,
- HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS,
- are not,
- disclaimer" for the program, if necessary,
- holder as a result of your choosing to follow a,
- holder explicitly and,
- holder is,
- holder is reinstated (a),
- holder notifies you of the,
- holder who authorizes use under this,
- holder, and you cure the violation prior to 30 days after,
- holders of,
- if you do,
- law,
- law, except executing it on a,
- on the Program, and are irrevocable provided the stated,
- on the software, and (2) offer you this License,
- permission,
- permission, other than the making of an,
- treaty adopted on 20 December 1996, or
-License: GPL-3+
+Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
+  <year> <name of author>
+  HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+  are not
+  disclaimer" for the program, if necessary
+  holder as a result of your choosing to follow a
+  holder explicitly and
+  holder is
+  holder is reinstated (a)
+  holder notifies you of the
+  holder who authorizes use under this
+  holder, and you cure the violation prior to 30 days after
+  holders of
+  if you do
+  law
+  law, except executing it on a
+  on the Program, and are irrevocable provided the stated
+  on the software, and (2) offer you this License
+  permission
+  permission, other than the making of an
+  treaty adopted on 20 December 1996, or
+License: GPL-ever
  FIXME
 
 Files: install-sh
@@ -285,10 +284,10 @@ License: UNKNOWN
  FIXME
 
 Files: po/Makevars
-Copyright: for their translations to this person,
- holder of the package.) Translators are,
- holder of the surrounding,
- holder that gets inserted into the header of the
+Copyright: for their translations to this person
+  holder of the package.) Translators are
+  holder of the surrounding
+  holder that gets inserted into the header of the
 License: UNKNOWN
  FIXME
 

-- 
gmerlin-encoders packaging

