[SCM] gmerlin-avdecoder/master: Regenerated control & copyright_hints

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

The following commit has been merged in the master branch:
commit cf0b3de22f5069637df8ae1942bd07fdc5ae9d87
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 15:21:37 2012 +0200

    Regenerated control & copyright_hints

diff --git a/debian/control b/debian/control
index 92443bb..139265b 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Build-Depends:
  libdvdread-dev (>= 4.1.3),
  libfaad-dev,
  libflac-dev,
- libgavl-dev (>=  1.2.0),
- libgmerlin-dev (>= 1.0.0~),
+ libgavl-dev (>=  1.4.0),
+ libgmerlin-dev (>= 1.2.0~),
  libgsm1-dev,
  libmad0-dev,
  libmpcdec-dev,
diff --git a/debian/copyright_hints b/debian/copyright_hints
index c01d8f2..30ec635 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -16,9 +16,12 @@ Files: include/a52_header.h
  include/bsf_private.h
  include/cavs_header.h
  include/codecs.h
+ include/cue.h
  include/dirac_header.h
  include/dvb_channels.h
  include/dvframe.h
+ include/flac_header.h
+ include/frametype.h
  include/h264_header.h
  include/http.h
  include/id3.h
@@ -76,11 +79,14 @@ Files: include/a52_header.h
  lib/chapterlist.c
  lib/charset.c
  lib/codecs.c
+ lib/cue.c
  lib/demux_4xm.c
+ lib/demux_8svx.c
  lib/demux_a52.c
  lib/demux_adif.c
  lib/demux_adts.c
  lib/demux_aiff.c
+ lib/demux_ape.c
  lib/demux_asf.c
  lib/demux_au.c
  lib/demux_avs.c
@@ -109,6 +115,8 @@ Files: include/a52_header.h
  lib/demux_psxstr.c
  lib/demux_quicktime.c
  lib/demux_r3d.c
+ lib/demux_ra.c
+ lib/demux_rm.c
  lib/demux_roq.c
  lib/demux_shorten.c
  lib/demux_smacker.c
@@ -133,10 +141,13 @@ Files: include/a52_header.h
  lib/dvframe.c
  lib/edl.c
  lib/fileindex.c
+ lib/flac_header.c
  lib/formattracker.c
+ lib/frametype.c
  lib/h264_header.c
  lib/http.c
  lib/id3v1.c
+ lib/id3v2.c
  lib/in_cb.c
  lib/in_dvb_linux.c
  lib/in_dvd.c
@@ -174,6 +185,8 @@ Files: include/a52_header.h
  lib/parse_cavs.c
  lib/parse_dca.c
  lib/parse_dirac.c
+ lib/parse_flac.c
+ lib/parse_mjpa.c
  lib/parse_mpeg4.c
  lib/parse_mpegaudio.c
  lib/parse_mpv.c
@@ -224,6 +237,7 @@ Files: include/a52_header.h
  lib/qt_trak.c
  lib/qt_tref.c
  lib/qt_udta.c
+ lib/qt_useratoms.c
  lib/qt_utils.c
  lib/qt_wave.c
  lib/r_asx.c
@@ -273,6 +287,7 @@ Files: include/a52_header.h
  lib/video_xadll.c
  lib/video_yuv.c
  lib/videoparser.c
+ lib/vorbis_comment.c
  lib/win32codec.c
  lib/xing.c
  lib/yml.c
@@ -324,6 +339,7 @@ Files: ABOUT-NLS
  debian/patches/autoconf_removed_sources.patch
  debian/patches/fix_dvdread_configure.patch
  debian/patches/fix_typos.patch
+ debian/patches/gmerlin_versioned_depends.patch
  debian/patches/series
  debian/patches/system_gsm.patch
  debian/restorefiles
@@ -525,68 +541,21 @@ Copyright: ((c >> 4)*10+(c&0xf))
 License: GPL-2+
  FIXME
 
-Files: COPYING
-Copyright: 1989, 1991 Free Software Foundation, Inc
-  <year> <name of author>
-  HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  HOLDERS AND/OR OTHER PARTIES
-  disclaimer" for the program, if
-  holder saying it may be distributed
-  holder who places the Program under this License
-  interest in the program
-  law:
-  the software, and
-  year name of author
-License: GPL-2+
- FIXME
-
 Files: plugins/avdec_common.c
 Copyright: 2001, - 2011, Members of the Gmerlin project
   = bg_strdup(dst->, str);
 License: GPL-2+
  FIXME
 
-Files: lib/demux_ra.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = bgav_convert_string(charset_cnv
-License: GPL-2+
- FIXME
-
-Files: lib/demux_rm.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = bgav_convert_string(cnv
-License: GPL-2+
- FIXME
-
 Files: lib/demux_ffmpeg.c
 Copyright: 2001, - 2011, Members of the Gmerlin project
   = bgav_strdup(avfc->);
-  = bgav_strdup(entry->value);
-License: GPL-2+
- FIXME
-
-Files: lib/vorbis_comment.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = bgav_strdup(field);
-License: GPL-2+
- FIXME
-
-Files: lib/id3v2.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = bgav_strdup(frame->strings[0
 License: GPL-2+
  FIXME
 
 Files: lib/demux_vivo.c
 Copyright: 2001, - 2011, Members of the Gmerlin project
   = bgav_strdup(pos);
-  = bgav_strdup(priv->header.);
-License: GPL-2+
- FIXME
-
-Files: lib/demux_8svx.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = buffer;
 License: GPL-2+
  FIXME
 
@@ -619,6 +588,21 @@ Copyright: 1997-1998, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
+Files: COPYING
+Copyright: 1989, 1991 Free Software Foundation, Inc
+  <year> <name of author>
+  HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+  HOLDERS AND/OR OTHER PARTIES
+  disclaimer" for the program, if
+  holder saying it may be distributed
+  holder who places the Program under this License
+  interest in the program
+  law:
+  the software, and
+  year name of author
+License: GPL-ever
+ FIXME
+
 Files: lib/RTjpeg.c
 Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
   1999, Wim Taymans <wim.taymans at tvd.be>
@@ -639,11 +623,6 @@ Copyright: 1994, X Consortium
 License: MIT/X11 (BSD like)
  FIXME
 
-Files: debian/patches/libav_0.7.patch
-Copyright: = bgav_strdup(entry->value);
-License: UNKNOWN
- FIXME
-
 Files: po/de.po
 Copyright: 2007, Members of the gmerlin project
 License: UNKNOWN

-- 
gmerlin-avdecoder packaging