[SCM] gmerlin-avdecoder/master: Update changelog, control file and copyright hints.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b7625b4a1290ce55a9fcbf213133ed4c586f8494
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 10 16:17:46 2010 +0100

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 5515a7e..e4eae74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,4 @@
-gmerlin-avdecoder (1.0.3~dfsg-1) UNRELEASED; urgency=BROKEN
-
-FIXME: pending FIXMEs in debian/copyright
-(set urgency=low above and remove this notice when solved)
-
-  * New upstream release.
+gmerlin-avdecoder (1.0.3+cvs20101118-1) UNRELEASED; urgency=low
 
   [ Reinhard Tartler ]
   * Add Vcs-Git fields to control file.
@@ -26,13 +21,20 @@ FIXME: pending FIXMEs in debian/copyright
   * Add copyright and licensing header to debian/rules.
   * Add myself as uploader.
   * Rewrite debian/copyright using rev. 135 of draft DEP5 format.
-  * Simplify autoconf patch to no longer handle stripped GSM610 dir:
-    gracefully handled upstream now.
+  * Add patch to strip unused BSD-4 licensed code, to avoid accidental
+    GPL violation.
+  * Use source format 3.0 (quilt).  Add local-options and suppress .pc
+    dir to ease building with git-buildpackage.
+  * Tighten build-dependencies to match new upstream needs:
+    + Tighten build-dependencies on libgavl-dev and libgmerlin-dev.
+    + Add build-dependency on libvdpau-dev.
+  * Add rules to bootstrap autotools files (CDBS normally only updates
+    them).
 
   [ Alessio Treglia ]
   * Import custom tarball from upstream CVS as of 2010-11-18.
 
- -- Jonas Smedegaard <dr at jones.dk>  Sat, 20 Nov 2010 10:09:40 +0100
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 10 Dec 2010 16:10:05 +0100
 
 gmerlin-avdecoder (1.0.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f1adf17..eb36084 100644
--- a/debian/control
+++ b/debian/control
@@ -17,13 +17,13 @@ Build-Depends: cdbs (>= 0.4.70~),
  patchutils (>= 0.2.25),
  cdbs (>= 0.4.27),
  devscripts (>= 2.10.7~), 
- doxygen, libgavl-dev (>=  1.1.2),
+ doxygen, libgavl-dev (>=  1.2.0),
  libavcodec-dev, libavformat-dev, libpostproc-dev, libswscale-dev, libflac-dev,
  libtheora-dev, libcdio-paranoia-dev, libtiff4-dev, libsmbclient-dev,
  libdca-dev, libdvdread-dev, libmpcdec-dev, libspeex-dev, libpng12-dev,
- libgmerlin-dev (>= 0.4.0), libmad0-dev, libmpeg2-4-dev, gmerlin-data,
+ libgmerlin-dev (>= 1.0.0), libmad0-dev, libmpeg2-4-dev, gmerlin-data,
  libdts-dev, libswscale-dev, libopenjpeg-dev, libdvdread-dev (>= 4.1.3),
- libvorbis-dev, libfaad-dev, liba52-0.7.4-dev
+ libvorbis-dev, libfaad-dev, liba52-0.7.4-dev, libvdpau-dev
 
 Package: libgmerlin-avdec1
 Architecture: any
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 349a821..49afdc5 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -162,6 +162,7 @@ Files: ./include/a52_header.h,
 	./lib/mxf.c,
 	./lib/nanosoft.c,
 	./lib/options.c,
+	./lib/os.c,
 	./lib/packet.c,
 	./lib/packetbuffer.c,
 	./lib/packetpool.c,
@@ -320,6 +321,8 @@ Files: ./ABOUT-NLS,
 	./debian/patches/autoconf_removed_sources.patch,
 	./debian/patches/fix_dvdread_configure.patch,
 	./debian/patches/series,
+	./debian/source/format,
+	./debian/source/local-options,
 	./debian/watch,
 	./doc/Doxyfile.in,
 	./doc/Makefile.am,
@@ -332,6 +335,7 @@ Files: ./ABOUT-NLS,
 	./include/bgav_vdpau.h,
 	./include/bgav_version.h.in,
 	./lib/Makefile.am,
+	./lib/os_inet_aton.c,
 	./lib/vdpau.c,
 	./m4/Makefile.am,
 	./m4/avcodec.m4,
@@ -459,17 +463,6 @@ Copyright: ((c > 127) ? 0xff : index_64[
 License: BSD (3 clause)
  FIXME
 
-Files: ./lib/os_inet_aton.c
-Copyright: 1983, 1990, 1993
-License: BSD (4 clause)
- FIXME
-
-Files: ./lib/os.c
-Copyright: 1983, 1990, 1993,
-	2001, - 2010, Members of the Gmerlin project
-License: BSD (4 clause) GPL-2+
- FIXME
-
 Files: ./debian/rules
 Copyright: 2008, Christian Marillat <marillat at debian.org>
 	2010, Jonas Smedegaard <dr at jones.dk>
@@ -585,6 +578,11 @@ Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
 License: LGPL-2.1+
  FIXME
 
+Files: ./debian/patches/strip_unused_BSD-4-licensed_code.patch
+Copyright: 1983, 1990, 1993
+License: UNKNOWN
+ FIXME
+
 Files: ./po/de.po
 Copyright: 2007, Members of the gmerlin project
 License: UNKNOWN

-- 
gmerlin-avdecoder packaging