[SCM] gmerlin-avdecoder/master: Regenerated d/{control, copyright_hints}

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Nov 23 14:32:05 UTC 2016


The following commit has been merged in the master branch:
commit 712b924c4861d5f6aee81181024d98bc24df4a3c
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Nov 23 15:23:17 2016 +0100

    Regenerated d/{control,copyright_hints}

diff --git a/debian/control b/debian/control
index 7689254..ec4baba 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,17 @@ Uploaders:
  Romain Beauxis <toots at rastageeks.org>,
  Jonas Smedegaard <dr at jones.dk>,
  IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>,
- Alessio Treglia <alessio at debian.org>
+ Alessio Treglia <alessio at debian.org>,
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.8
 Build-Depends:
  cdbs,
  autotools-dev,
  gnulib,
- debhelper (>= 9~),
+ debhelper,
  dh-buildinfo,
  dh-autoreconf,
- devscripts,
+ licensecheck,
  doxygen,
  liba52-0.7.4-dev,
  libavcodec-dev,
@@ -36,7 +36,6 @@ Build-Depends:
  libmpeg2-4-dev,
  libpng-dev,
  libpostproc-dev,
- libschroedinger-dev,
  libsmbclient-dev,
  libspeex-dev,
  libswscale-dev,
@@ -44,15 +43,15 @@ Build-Depends:
  libtiff-dev,
  libvdpau-dev,
  libvorbis-dev,
- libxext-dev
+ libxext-dev,
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/gmerlin-avdecoder.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/gmerlin-avdecoder.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/gmerlin-avdecoder.git
 
 Package: libgmerlin-avdec1
 Architecture: any
 Depends:
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: general multimedia decoding library
@@ -69,7 +68,7 @@ Section: libdevel
 Depends:
  libgavl-dev,
  libgmerlin-avdec1 (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
 Multi-Arch: same
 Description: general multimedia decoding library (development files)
  Gmerlin_avdecoder is a general purpose media decoding library. It was
@@ -81,9 +80,10 @@ Description: general multimedia decoding library (development files)
 
 Package: libgmerlin-avdec-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends:
- ${misc:Depends}
+ ${misc:Depends},
 Description: general multimedia decoding library (documentation)
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -99,7 +99,7 @@ Depends:
  libgmerlin-avdec1 (= ${binary:Version}),
  libgmerlin0 (>= 1.2.0~),
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Multi-Arch: same
 Description: avdecoder plugins for Gmerlin
  Gmerlin_avdecoder is a general purpose media decoding library. It was
diff --git a/debian/copyright_hints b/debian/copyright_hints
index d24f3cc..381debe 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -7,14 +7,12 @@ Disclaimer: Autogenerated by CDBS
 Files: include/a52_header.h
  include/aac_frame.h
  include/audioparser_priv.h
- include/avdec.h
  include/avdec_private.h
  include/bgav_dca.h
  include/bgavdefs.h
  include/bitstream.h
  include/bsf.h
  include/bsf_private.h
- include/bswap.h
  include/cavs_header.h
  include/codecs.h
  include/cue.h
@@ -34,14 +32,12 @@ 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
  include/pes_header.h
  include/pngreader.h
  include/ptscache.h
- include/qt.h
  include/rmff.h
  include/rtp.h
  include/rtsp.h
@@ -83,15 +79,11 @@ Files: include/a52_header.h
  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_avi.c
  lib/demux_avs.c
  lib/demux_daud.c
  lib/demux_dsicin.c
@@ -118,10 +110,7 @@ Files: include/a52_header.h
  lib/demux_ogg.c
  lib/demux_p2xml.c
  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
@@ -132,7 +121,6 @@ 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
@@ -153,7 +141,6 @@ Files: include/a52_header.h
  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
@@ -173,14 +160,12 @@ Files: include/a52_header.h
  lib/languages.c
  lib/log.c
  lib/matroska.c
- lib/metadata.c
  lib/mms.c
  lib/mpa_header.c
  lib/mpeg4_header.c
  lib/mpegts_common.c
  lib/mpv_header.c
  lib/mxf.c
- lib/nanosoft.c
  lib/options.c
  lib/packet.c
  lib/packetbuffer.c
@@ -243,7 +228,6 @@ Files: include/a52_header.h
  lib/qt_tmcd.c
  lib/qt_trak.c
  lib/qt_tref.c
- lib/qt_udta.c
  lib/qt_useratoms.c
  lib/qt_utils.c
  lib/qt_wave.c
@@ -255,7 +239,6 @@ Files: include/a52_header.h
  lib/r_rtsptext.c
  lib/r_smil.c
  lib/redirect.c
- lib/rmff.c
  lib/rtcp.c
  lib/rtp.c
  lib/rtpbuffer.c
@@ -294,11 +277,9 @@ 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
- plugins/avdec_common.c
  plugins/avdec_common.h
  plugins/i_avdec.c
  plugins/i_dvb.c
@@ -316,8 +297,8 @@ Files: include/a52_header.h
  tests/seektest.c
  tests/vcdtest.c
  tests/ymltest.c
-Copyright: 2001, - 2008, Members of the Gmerlin project
-  2001, - 2011, Members of the Gmerlin project
+Copyright: 2001-2008, Members of the Gmerlin project
+  2001-2011, Members of the Gmerlin project
 License: GPL-2+
  FIXME
 
@@ -343,7 +324,6 @@ Files: ABOUT-NLS
  debian/libgmerlin-avdec-doc.doc-base
  debian/libgmerlin-avdec-doc.install
  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
@@ -379,11 +359,9 @@ Files: ABOUT-NLS
  plugins/Makefile.am
  po/ChangeLog
  po/LINGUAS
- po/Makevars
  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
@@ -393,7 +371,7 @@ Files: ABOUT-NLS
  tests/Makefile.am
  utils/Makefile.am
  utils/cpuinfo.c
-Copyright: *No copyright*
+Copyright: NONE
 License: UNKNOWN
  FIXME
 
@@ -428,28 +406,28 @@ Files: config.rpath
  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
 
@@ -461,7 +439,7 @@ Files: Makefile.in
  plugins/Makefile.in
  tests/Makefile.in
  utils/Makefile.in
-Copyright: 1994-2002, 2003-2009, Free Software Foundation,
+Copyright: 1994-2009, Free Software Foundation,
 License: UNKNOWN
  FIXME
 
@@ -474,60 +452,226 @@ Copyright: 2000-2002, the xine project
 License: GPL-2+
  FIXME
 
-Files: aclocal.m4
- include/md5.h
+Files: include/md5.h
  lib/md5.c
-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.
+ ltmain.sh
+Copyright: 1995-1997, 1999-2001, 2004-2006, Free Software Foundation, Inc.
+  1995-1997, 1999-2001, 2005-2006, Free Software Foundation, Inc.
+  1996-2001, 2003-2008, 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
+Copyright: 2001-2003, Emil Mikulic.
 License: UNKNOWN
  FIXME
 
 Files: lib/base64.c
-Copyright: 1998-2000, University College London
+Copyright: 1991, Bell Communications Research, Inc. (Bellcore)
+  1998-2000, University College London
 License: BSD-3-clause
  FIXME
 
 Files: install-sh
 Copyright: 1994, X Consortium
-  and license
 License: Expat
  FIXME
 
+Files: lib/demux_vivo.c
+Copyright: %sn", h->copyright);
+  2001-2011, Members of the Gmerlin project
+  priv->header.copyright);
+License: GPL-2+
+ FIXME
+
+Files: include/avdec.h
+Copyright: (const bgav_metadata_t * metadata);
+  2001-2011, Members of the Gmerlin project
+License: GPL-2+
+ FIXME
+
+Files: lib/metadata.c
+Copyright: (const bgav_metadata_t*m)
+  2001-2011, Members of the Gmerlin project
+License: GPL-2+
+ FIXME
+
 Files: debian/rules
 Copyright: 2008, Christian Marillat <marillat at debian.org>
-  2010, 2012 Jonas Smedegaard <dr at jones.dk>
-  2011, IOhannes m zmölnig <zmoelnig at iem.at>
+  2010, 2012, Jonas Smedegaard <dr at jones.dk>
+  2011-2016, IOhannes m zmölnig <umlaeute at debian.org>
 License: GPL-2+
  FIXME
 
 Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
+Copyright: 1999-2000, 2003-2007, 2009, Free
 License: GPL-2+
  FIXME
 
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
+Files: include/bswap.h
+Copyright: 1997-1998, Free Software Foundation, Inc.
+  2001-2011, Members of the Gmerlin project
+License: GPL-2+
+ FIXME
+
+Files: aclocal.m4
+Copyright: 1996-1997, 2000-2001, 2003, 2005, 2008, Free Software Foundation, Inc.
+  1996-1997, 2000-2001, 2003, 2005, Free Software Foundation, Inc.
+  1996-2001, 2003-2008, Free Software Foundation, Inc.
+  1996-2006, 2008-2009, Free Software Foundation, Inc.
+  1996-2009, Free Software Foundation, Inc.
+  1997, 1999-2001, 2003-2005, 2008, Free Software Foundation, Inc.
+  1997, 2000-2001, 2003-2006, 2008, Free Software Foundation, Inc.
+  1999-2005, 2008, Free Software Foundation, Inc.
+  1999-2006, 2009, Free Software Foundation, Inc.
+  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: COPYING
-Copyright: 1989, 1991 Free Software Foundation, Inc
-License: GPL-ever
+Copyright: 1989, 1991, Free Software Foundation, Inc.
+  <year> <name of author>
+  disclaimer" for the program, if
+  ed by the Free
+  ed interfaces, the
+  interest in the program
+  the software, and
+  year name of author
+License: GPL-2+
+ FIXME
+
+Files: lib/qt_udta.c
+Copyright: -Character, from the Quicktime Spec
+  2001-2011, Members of the Gmerlin project
+  FREE(udta->day); Date
+  PRINT(day); Date
+  char * day; Date
+  ret->cpy = read_string(&ch, input, ret->have_ilst);
+License: GPL-2+
+ FIXME
+
+Files: include/qt.h
+Copyright: -Character, from the Quicktime Spec
+  2001-2011, Members of the Gmerlin project
+  char * day; Date
+License: GPL-2+
+ FIXME
+
+Files: lib/demux_avi.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  ED 0x00020000
+License: GPL-2+
+ FIXME
+
+Files: include/nanosoft.h
+Copyright: 2001-2011, Members of the Gmerlin project
+  Encyclopedia International 1991." If there are multiple copyrights, separate them
+License: GPL-2+
+ FIXME
+
+Files: lib/nanosoft.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  ICOP);
+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,
+  data += 2;
+  priv->header->cont.copyright_len,
+License: GPL-2+
+ FIXME
+
+Files: lib/demux_asf.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  bgav_convert_string(cnv, str, len3,
+  if(len3)
+License: GPL-2+
+ FIXME
+
+Files: lib/demux_8svx.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  buffer);
+License: GPL-2+
+ FIXME
+
+Files: lib/rmff.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  cont->copyright_len);
+  ret->cont.copyright_len);
+  ret->copyright_len);
+License: GPL-2+
+ FIXME
+
+Files: lib/demux_quicktime.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  cpy);
+License: GPL-2+
+ FIXME
+
+Files: lib/vorbis_comment.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  field);
+License: GPL-2+
+ FIXME
+
+Files: plugins/avdec_common.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  str);
+License: GPL-2+
+ FIXME
+
+Files: lib/demux_aiff.c
+Copyright: 2001-2011, Members of the Gmerlin project
+  tmp_string);
+License: GPL-2+
+ FIXME
+
+Files: lib/id3v2.c
+Copyright: frame->strings[0
+License: GPL-2+
+ 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.gmo
+Copyright: 
+License: UNKNOWN
  FIXME
 
 Files: po/de.po
@@ -540,8 +684,18 @@ Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: UNKNOWN
  FIXME
 
+Files: debian/libgmerlin-avdec1.symbols
+Copyright: @Base 1.0.0
+License: UNKNOWN
+ FIXME
+
 Files: po/gmerlin-avdecoder.pot
 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