[SCM] gmerlin-avdecoder/master: Update changelog, control file and copyright hints.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sat Nov 20 09:28:44 UTC 2010
The following commit has been merged in the master branch:
commit a3a69da58431eda1dce997eadedaf887721b7eaa
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sat Nov 20 10:28:35 2010 +0100
Update changelog, control file and copyright hints.
diff --git a/debian/changelog b/debian/changelog
index 58fe43b..5515a7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,22 @@
gmerlin-avdecoder (1.0.3~dfsg-1) UNRELEASED; urgency=BROKEN
FIXME: pending FIXMEs in debian/copyright
-(set urgency=low above when done)
+(set urgency=low above and remove this notice when solved)
* New upstream release.
[ Reinhard Tartler ]
- * add Vcs-Git fields to, and cleanup whitespace from, control file.
+ * Add Vcs-Git fields to control file.
+ * Cleanup whitespace in control file.
[ IOhannes m zmölnig ]
- * Fix dvdread patch to not touch auto(re)generated files. and extend
- with missing DVDInit/DVDFinish backported from upstream.
+ * Fix dvdread patch to not touch auto(re)generated files.
* Add patch to remove references to stripped sources.
+ * Update debian/libgmerlin-avdec1.symbols to only list exported
+ symbols.
+ * Add new exported symbols.
+ * Tighten build-dependency on libgavl-dev to at least 1.1.2.
+ * Bump standards-version to 3.9.1.
[ Jonas Smedegaard ]
* Include upstream-tarballs.mk, and repackage with non-DFSG-free
@@ -21,8 +26,13 @@ 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.
- -- Jonas Smedegaard <dr at jones.dk> Sun, 15 Aug 2010 00:23:45 +0200
+ [ 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
gmerlin-avdecoder (1.0.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b06822b..f1adf17 100644
--- a/debian/control
+++ b/debian/control
@@ -7,17 +7,16 @@ Uploaders: Romain Beauxis <toots at rastageeks.org>,
Homepage: http://gmerlin.sourceforge.net/
Standards-Version: 3.9.1
Build-Depends: cdbs (>= 0.4.70~),
- autotools-dev,
gnulib,
debhelper (>= 7.0.1),
+ dh-buildinfo,
libtool,
automake1.10,
autoconf,
quilt,
patchutils (>= 0.2.25),
cdbs (>= 0.4.27),
- devscripts (>= 2.10.7~),
- dh-buildinfo,
+ devscripts (>= 2.10.7~),
doxygen, libgavl-dev (>= 1.1.2),
libavcodec-dev, libavformat-dev, libpostproc-dev, libswscale-dev, libflac-dev,
libtheora-dev, libcdio-paranoia-dev, libtiff4-dev, libsmbclient-dev,
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 71b2482..349a821 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -9,6 +9,8 @@ Files: ./include/a52_header.h,
./include/bgav_dca.h,
./include/bgavdefs.h,
./include/bitstream.h,
+ ./include/bsf.h,
+ ./include/bsf_private.h,
./include/cavs_header.h,
./include/codecs.h,
./include/dirac_header.h,
@@ -18,6 +20,7 @@ Files: ./include/a52_header.h,
./include/http.h,
./include/id3.h,
./include/language_table.h,
+ ./include/matroska.h,
./include/mms.h,
./include/mpa_header.h,
./include/mpeg4_header.h,
@@ -25,6 +28,7 @@ Files: ./include/a52_header.h,
./include/mpv_header.h,
./include/mxf.h,
./include/os.h,
+ ./include/packettimer.h,
./include/parser.h,
./include/pes_header.h,
./include/pngreader.h,
@@ -62,6 +66,8 @@ Files: ./include/a52_header.h,
./lib/audioparser.c,
./lib/bgav.c,
./lib/bitstream.c,
+ ./lib/bsf.c,
+ ./lib/bsf_avcc.c,
./lib/bytebuffer.c,
./lib/cavs_header.c,
./lib/chapterlist.c,
@@ -86,6 +92,7 @@ Files: ./include/a52_header.h,
./lib/demux_gsm.c,
./lib/demux_gxf.c,
./lib/demux_ircam.c,
+ ./lib/demux_matroska.c,
./lib/demux_mpegaudio.c,
./lib/demux_mpegps.c,
./lib/demux_mpegvideo.c,
@@ -123,6 +130,7 @@ Files: ./include/a52_header.h,
./lib/dvframe.c,
./lib/edl.c,
./lib/fileindex.c,
+ ./lib/formattracker.c,
./lib/h264_header.c,
./lib/http.c,
./lib/id3v1.c,
@@ -144,6 +152,7 @@ Files: ./include/a52_header.h,
./lib/keyframetable.c,
./lib/languages.c,
./lib/log.c,
+ ./lib/matroska.c,
./lib/metadata.c,
./lib/mms.c,
./lib/mpa_header.c,
@@ -155,6 +164,8 @@ Files: ./include/a52_header.h,
./lib/options.c,
./lib/packet.c,
./lib/packetbuffer.c,
+ ./lib/packetpool.c,
+ ./lib/packettimer.c,
./lib/parse_a52.c,
./lib/parse_aac.c,
./lib/parse_cavs.c,
@@ -164,6 +175,7 @@ Files: ./include/a52_header.h,
./lib/parse_mpegaudio.c,
./lib/parse_mpv.c,
./lib/parse_vc1.c,
+ ./lib/parse_vorbis.c,
./lib/pes_header.c,
./lib/pngreader.c,
./lib/ptscache.c,
@@ -254,6 +266,7 @@ Files: ./include/a52_header.h,
./lib/video_tga.c,
./lib/video_theora.c,
./lib/video_tiff.c,
+ ./lib/video_vpx.c,
./lib/video_win32.c,
./lib/video_xadll.c,
./lib/video_yuv.c,
@@ -265,7 +278,19 @@ Files: ./include/a52_header.h,
./plugins/i_avdec.c,
./plugins/i_dvb.c,
./plugins/i_dvd.c,
- ./plugins/i_vcd.c
+ ./plugins/i_vcd.c,
+ ./tests/bgavdemux.c,
+ ./tests/bgavdump.c,
+ ./tests/bgavsave.c,
+ ./tests/count_samples.c,
+ ./tests/frametable.c,
+ ./tests/indexdump.c,
+ ./tests/indextest.c,
+ ./tests/mmstest.c,
+ ./tests/rtsptest.c,
+ ./tests/seektest.c,
+ ./tests/vcdtest.c,
+ ./tests/ymltest.c
Copyright: 2001, - 2008, Members of the Gmerlin project
2001, - 2010, Members of the Gmerlin project
License: GPL-2+
@@ -294,20 +319,18 @@ Files: ./ABOUT-NLS,
./debian/libgmerlin-avdec1.symbols,
./debian/patches/autoconf_removed_sources.patch,
./debian/patches/fix_dvdread_configure.patch,
- ./debian/patches/export_visibility.patch,
./debian/patches/series,
./debian/watch,
./doc/Doxyfile.in,
./doc/Makefile.am,
./doc/gavl.tags,
./doc/mainpage.incl,
+ ./ffmpeg_codecs.txt,
./gmerlin_avdec.pc.in,
./gmerlin_avdec.spec.in,
./include/Makefile.am,
./include/bgav_vdpau.h,
- ./include/bgav_version.h,
./include/bgav_version.h.in,
- ./include/config.h.in,
./lib/Makefile.am,
./lib/vdpau.c,
./m4/Makefile.am,
@@ -319,22 +342,21 @@ Files: ./ABOUT-NLS,
./plugins/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/messages.mo,
./po/quot.sed,
./po/remove-potcdate.sin,
- ./po/stamp-po,
./tests/Makefile.am,
- ./tests/bgavsave.c,
- ./tests/mmstest.c,
- ./tests/rtsptest.c,
- ./tests/vcdtest.c,
- ./tests/ymltest.c,
+ ./tests/iso639-utf8.txt,
+ ./tests/iso639_to_c.awk,
+ ./tests/iso639_to_c1.awk,
+ ./update_copyright.sh,
+ ./update_libw32dll.sh,
./utils/Makefile.am,
./utils/cpuinfo.c
Copyright: *No copyright*
@@ -397,28 +419,6 @@ Copyright: 1995-2002, 2004-2005, Free Software Foundation, Inc
License: UNKNOWN
FIXME
-Files: ./Makefile.in,
- ./doc/Makefile.in,
- ./include/Makefile.in,
- ./lib/Makefile.in,
- ./m4/Makefile.in,
- ./plugins/Makefile.in,
- ./tests/Makefile.in,
- ./utils/Makefile.in
-Copyright: 1994-2002
-License: UNKNOWN
- FIXME
-
-Files: ./tests/bgavdump.c,
- ./tests/count_samples.c,
- ./tests/frametable.c,
- ./tests/indexdump.c,
- ./tests/indextest.c
-Copyright: 2003-2004, Burkhard Plaum - plaum at ipf.uni-stuttgart.de
- 2003-2009, Burkhard Plaum - plaum at ipf.uni-stuttgart.de
-License: UNKNOWN
- FIXME
-
Files: ./include/asmrp.h,
./lib/asmrp.c,
./lib/pnm.c,
@@ -429,21 +429,12 @@ License: GPL-2+
FIXME
Files: ./include/md5.h,
- ./lib/md5.c,
- ./missing
+ ./lib/md5.c
Copyright: 1995-1997,1999-2001,2004-2006
1995-1997,1999-2001,2005-2006
- 1996-1997, 1999-2000, 2002-2006
License: GPL
FIXME
-Files: ./config.guess,
- ./config.sub
-Copyright: 1992-1999,
- 1992-2001
-License: GPL-2+
- FIXME
-
Files: ./lib/targa.c,
./lib/targa.h
Copyright: 2001-2003, Emil Mikulic
@@ -451,16 +442,31 @@ Copyright: 2001-2003, Emil Mikulic
License: UNKNOWN
FIXME
-Files: ./lib/os.c
-Copyright: 1983, 1990, 1993,
- 2001, - 2010, Members of the Gmerlin project
-License: BSD (4 clause) GPL-2+
+Files: ./po/Makevars,
+ ./po/Makevars.template
+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
+
+Files: ./lib/base64.c
+Copyright: ((c > 127) ? 0xff : index_64[
+ 1991, Bell Communications Research, Inc. (Bellcore)
+ HOLDERS AND CONTRIBUTORS ``AS
+ holders nor the names of its
+License: BSD (3 clause)
+ FIXME
+
+Files: ./lib/os_inet_aton.c
+Copyright: 1983, 1990, 1993
+License: BSD (4 clause)
FIXME
-Files: ./include/bgav_sem.h
-Copyright: 1996-1997
+Files: ./lib/os.c
+Copyright: 1983, 1990, 1993,
2001, - 2010, Members of the Gmerlin project
- below. */
License: BSD (4 clause) GPL-2+
FIXME
@@ -470,47 +476,6 @@ Copyright: 2008, Christian Marillat <marillat at debian.org>
License: GPL
FIXME
-Files: ./depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
-License: GPL
- FIXME
-
-Files: ./configure
-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-2006, 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: ./lib/demux_mpegts.c
Copyright: ( ((( >> 4) & 0x0f) * 10) + ( & 0x0f) )
2001, - 2010, Members of the Gmerlin project
@@ -599,11 +564,6 @@ Copyright: 2001, - 2010, Members of the Gmerlin project
License: GPL-2+
FIXME
-Files: ./ltmain.sh
-Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
-License: GPL-2+
- FIXME
-
Files: ./include/bswap.h
Copyright: 1997-1998, Free Software Foundation, Inc
2001, - 2010, Members of the Gmerlin project
@@ -625,16 +585,6 @@ Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
License: LGPL-2.1+
FIXME
-Files: ./install-sh
-Copyright: 1994, X Consortium
-License: MIT/X11 (BSD like)
- FIXME
-
-Files: ./lib/base64.c
-Copyright: ((c > 127) ? 0xff : index_64[
-License: UNKNOWN
- FIXME
-
Files: ./po/de.po
Copyright: 2007, Members of the gmerlin project
License: UNKNOWN
@@ -650,11 +600,3 @@ Copyright: YEAR Members of the gmerlin project
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
-License: UNKNOWN
- FIXME
-
--
gmerlin-avdecoder packaging
More information about the pkg-multimedia-commits
mailing list