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

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue Nov 3 12:25:32 UTC 2015


The following commit has been merged in the master branch:
commit 879ebfe11d31f05495e9fb6a163c2ea01e4710be
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Nov 3 12:30:43 2015 +0100

    Regenerated debian/control|copyright_hints

diff --git a/debian/control b/debian/control
index b236b45..9e33e5f 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Build-Depends:
  libvorbis-dev,
  libxext-dev
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gmerlin-avdecoder.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/gmerlin-avdecoder.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/gmerlin-avdecoder.git
 
 Package: libgmerlin-avdec1
 Architecture: any
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 575daa7..d24f3cc 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -14,6 +14,7 @@ Files: include/a52_header.h
  include/bitstream.h
  include/bsf.h
  include/bsf_private.h
+ include/bswap.h
  include/cavs_header.h
  include/codecs.h
  include/cue.h
@@ -33,6 +34,7 @@ Files: include/a52_header.h
  include/mpegts_common.h
  include/mpv_header.h
  include/mxf.h
+ include/nanosoft.h
  include/os.h
  include/packettimer.h
  include/parser.h
@@ -95,6 +97,7 @@ Files: include/a52_header.h
  lib/demux_dsicin.c
  lib/demux_dv.c
  lib/demux_dxa.c
+ lib/demux_ffmpeg.c
  lib/demux_flac.c
  lib/demux_fli.c
  lib/demux_flv.c
@@ -129,6 +132,7 @@ Files: include/a52_header.h
  lib/demux_thp.c
  lib/demux_tiertex.c
  lib/demux_tta.c
+ lib/demux_vivo.c
  lib/demux_vmd.c
  lib/demux_voc.c
  lib/demux_vqa.c
@@ -294,6 +298,7 @@ Files: include/a52_header.h
  lib/win32codec.c
  lib/xing.c
  lib/yml.c
+ plugins/avdec_common.c
  plugins/avdec_common.h
  plugins/i_avdec.c
  plugins/i_dvb.c
@@ -332,6 +337,7 @@ Files: ABOUT-NLS
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/git-tuneclone.sh
  debian/gmerlin-plugins-avdecoder.install
  debian/libgmerlin-avdec-dev.install
  debian/libgmerlin-avdec-doc.doc-base
@@ -339,6 +345,7 @@ Files: ABOUT-NLS
  debian/libgmerlin-avdec1.install
  debian/libgmerlin-avdec1.symbols
  debian/patches/autoconf_removed_sources.patch
+ debian/patches/ffmpeg_2.9.patch
  debian/patches/fix-ftbfs-libav9.patch
  debian/patches/fix_dvdread_configure.patch
  debian/patches/fix_typos.patch
@@ -372,6 +379,7 @@ Files: ABOUT-NLS
  plugins/Makefile.am
  po/ChangeLog
  po/LINGUAS
+ po/Makevars
  po/POTFILES.in
  po/Rules-quot
  po/boldquot.sed
@@ -453,7 +461,7 @@ Files: Makefile.in
  plugins/Makefile.in
  tests/Makefile.in
  utils/Makefile.in
-Copyright: 1994-2002
+Copyright: 1994-2002, 2003-2009, Free Software Foundation,
 License: UNKNOWN
  FIXME
 
@@ -466,13 +474,23 @@ Copyright: 2000-2002, the xine project
 License: GPL-2+
  FIXME
 
-Files: include/md5.h
+Files: aclocal.m4
+ include/md5.h
  lib/md5.c
-Copyright: 1995-1997,1999-2001,2004-2006
-  1995-1997,1999-2001,2005-2006
+Copyright: 1995-1997,1999-2001,2004-2006, Free Software Foundation, Inc.
+  1995-1997,1999-2001,2005-2006, Free Software Foundation, Inc.
+  1996-2004, 2005-2009, Free Software Foundation, Inc.
 License: GPL-2+
  FIXME
 
+Files: include/RTjpeg.h
+ lib/RTjpeg.c
+Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
+  1999, Wim Taymans <wim.taymans at tvd.be>
+  Justin Schoeman 1998, (justin at suntiger.ee.up.ac.za)
+License: LGPL-2.1+
+ FIXME
+
 Files: lib/targa.c
  lib/targa.h
 Copyright: 2001-2003, Emil Mikulic
@@ -480,61 +498,16 @@ License: UNKNOWN
  FIXME
 
 Files: lib/base64.c
-Copyright: 1991, Bell Communications Research, Inc. (Bellcore)
-  1998-2000, University College London
+Copyright: 1998-2000, University College London
 License: BSD-3-clause
  FIXME
 
 Files: install-sh
 Copyright: 1994, X Consortium
+  and license
 License: Expat
  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: plugins/avdec_common.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = bg_strdup(dst->, str);
-License: GPL-2+
- FIXME
-
-Files: lib/demux_ffmpeg.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = bgav_strdup(avfc->);
-License: GPL-2+
- FIXME
-
-Files: lib/demux_vivo.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  = bgav_strdup(pos);
-License: GPL-2+
- FIXME
-
 Files: debian/rules
 Copyright: 2008, Christian Marillat <marillat at debian.org>
   2010, 2012 Jonas Smedegaard <dr at jones.dk>
@@ -542,12 +515,6 @@ Copyright: 2008, Christian Marillat <marillat at debian.org>
 License: GPL-2+
  FIXME
 
-Files: include/nanosoft.h
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  Encyclopedia International 1991." If there are multiple s, separate them
-License: GPL-2+
- FIXME
-
 Files: depcomp
 Copyright: 1999-2000, 2003-2007, 2009 Free
 License: GPL-2+
@@ -558,38 +525,11 @@ 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, - 2011, Members of the Gmerlin project
-License: GPL-2+
- FIXME
-
 Files: COPYING
 Copyright: 1989, 1991 Free Software Foundation, Inc
-  <year> <name of author>
-  disclaimer" for the program, if
-  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>
-  Justin Schoeman 1998
-  Justin Schoeman 1998, (justin at suntiger.ee.up.ac.za)
-License: LGPL-2.1+
- FIXME
-
-Files: include/RTjpeg.h
-Copyright: 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
-  1999, Wim Taymans <wim.taymans at tvd.be>
-  Justin Schoeman 1998, (justin at suntiger.ee.up.ac.za)
-License: LGPL-2.1+
- FIXME
-
 Files: po/de.po
 Copyright: 2007, Members of the gmerlin project
 License: UNKNOWN
@@ -605,8 +545,3 @@ Copyright: YEAR Members of the gmerlin project
 License: UNKNOWN
  FIXME
 
-Files: po/Makevars
-Copyright: for their translations to this person
-License: UNKNOWN
- FIXME
-

-- 
gmerlin-avdecoder packaging



More information about the pkg-multimedia-commits mailing list