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

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Mar 9 23:28:30 UTC 2016


The following commit has been merged in the master branch:
commit 21cc01a723a7f19d8d17adcbe6320b7c7dcc29e1
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Mar 10 00:03:50 2016 +0100

    Regenerated debian/control|copyright_hints

diff --git a/debian/control b/debian/control
index e42c79f..18c107e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,16 +7,14 @@ Uploaders:
  IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>,
  Romain Beauxis <toots at rastageeks.org>
 Homepage: http://gmerlin.sourceforge.net/
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Build-Depends:
  cdbs,
  autotools-dev,
  gnulib,
  debhelper (>= 9~),
  dh-buildinfo,
- libtool,
- automake1.11,
- autoconf,
+ dh-autoreconf,
  devscripts,
  doxygen,
  fontconfig,
@@ -40,7 +38,7 @@ Build-Depends:
  libxv-dev,
  texinfo
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/gmerlin.git
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gmerlin.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/gmerlin.git
 
 Package: gmerlin
 Architecture: any
@@ -112,23 +110,6 @@ Description: multiformat media player - data files
  .
  This package contains data files (theme,icons files) for gmerlin.
 
-Package: gmerlin-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Depends:
- gmerlin (= ${binary:Version}),
- ${misc:Depends}
-Priority: extra
-Description: debugging symbols for gmerlin
- Gmerlin is a multiformat media player with tree-like virtual directory
- structure, where you can save your files, webstreams or whatever. It
- handles even large media collections gracefully. Hardware devices appear
- also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
- DVB-broadcasts.
- .
- This package contains the debugging symbols for gmerlin.
-
 Package: libgmerlin0
 Section: libs
 Architecture: any
diff --git a/debian/copyright_hints b/debian/copyright_hints
index bb34f7f..f5b8322 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -158,6 +158,7 @@ Files: apps/alsamixer/alsamixer.h
  lib/chapterlist.c
  lib/chapterlist_xml.c
  lib/charset.c
+ lib/cmdline.c
  lib/converters.c
  lib/device.c
  lib/edl.c
@@ -167,6 +168,7 @@ Files: apps/alsamixer/alsamixer.h
  lib/fileformat.c
  lib/filters.c
  lib/formats.c
+ lib/gtk/aboutwindow.c
  lib/gtk/albumentry.c
  lib/gtk/albumwidget.c
  lib/gtk/albumwindow.c
@@ -349,6 +351,7 @@ Files: apps/alsamixer/alsamixer.h
  plugins/v4l2/ov_v4l2.c
  plugins/v4l2/v4l2_common.c
  plugins/v4l2/v4l2_common.h
+ plugins/videofilters/bgyadif.c
  plugins/videofilters/bgyadif.h
  plugins/videofilters/colormatrix.c
  plugins/videofilters/colormatrix.h
@@ -397,6 +400,7 @@ Files: apps/alsamixer/alsamixer.h
  tests/gmerlin_vpsnr.c
  tests/imgconvert.c
  tests/insertchannel.c
+ tests/ladspa.c
  tests/message.c
  tests/msgtest.c
  tests/ocrtest.c
@@ -430,6 +434,7 @@ Files: ABOUT-NLS
  apps/cmdlineplayer/Makefile.am
  apps/cmdlineplayer/gmerlin_play.1
  apps/cmdlinerecorder/Makefile.am
+ apps/cmdlinerecorder/gmerlin-record.1
  apps/kbd/Makefile.am
  apps/kbd/gmerlin-kbd.desktop
  apps/nmjedit/Makefile.am
@@ -461,6 +466,7 @@ Files: ABOUT-NLS
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/git-tuneclone.sh
  debian/gmerlin-data.install
  debian/gmerlin-data.links
  debian/gmerlin-data.lintian-overrides
@@ -491,6 +497,7 @@ Files: ABOUT-NLS
  debian/patches/gmerlin_visualizer_slave.patch
  debian/patches/hardening_ldflags.patch
  debian/patches/replace_bg_sem_h.patch
+ debian/patches/reproducible.patch
  debian/patches/series
  debian/patches/strip_doc_out.patch
  debian/restorefiles
@@ -547,6 +554,7 @@ Files: ABOUT-NLS
  plugins/x11/Makefile.am
  po/ChangeLog
  po/LINGUAS
+ po/Makevars
  po/POTFILES.in
  po/Rules-quot
  po/boldquot.sed
@@ -613,7 +621,7 @@ Files: Makefile.in
  skins/Makefile.in
  tests/Makefile.in
  utils/Makefile.in
-Copyright: 1994-2002
+Copyright: 1994-2002, 2003-2009, Free Software Foundation,
 License: UNKNOWN
  FIXME
 
@@ -673,16 +681,17 @@ Copyright: 1995-2002, 2004-2005, Free Software Foundation, Inc
 License: UNKNOWN
  FIXME
 
-Files: config.guess
+Files: aclocal.m4
+ config.guess
  config.sub
  include/md5.h
  lib/md5.c
  missing
-Copyright: 1992-1999,
-  1992-2001
-  1995-1997,1999-2001,2004-2006
-  1995-1997,1999-2001,2005-2006
-  1996-1997, 1999-2000, 2002-2006
+Copyright: 1992-1999, 2000-2009, Free Software Foundation, Inc.
+  1995-1997,1999-2001,2004-2006, Free Software Foundation, Inc.
+  1995-1997,1999-2001,2005-2006, Free Software Foundation, Inc.
+  1996-1997, 1999-2000, 2002-2006, 2008-2009, Free Software Foundation, Inc.
+  1996-2004, 2005-2009, Free Software Foundation, Inc.
 License: GPL-2+
  FIXME
 
@@ -705,66 +714,24 @@ License: BSD-2-clause
 
 Files: install-sh
 Copyright: 1994, X Consortium
+  and license
 License: Expat
  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, 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: tests/ladspa.c
-Copyright: %s\n", desc->);
-  2001, - 2011, Members of the Gmerlin project
-License: GPL-2+
- FIXME
-
 Files: debian/rules
 Copyright: 2010, Romain Beauxis <toots at rastageeks.org>
   2010-2011, Alessio Treglia <alessio at debian.org>
-  2011, IOhannes m zmölnig <zmoelnig at iem.at>
+  2011, IOhannes m zmölnig <zmoelnig at iem.at>
 License: GPL-2+
  FIXME
 
-Files: plugins/videofilters/bgyadif.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  2006, Michael Niedermayer <michaelni at gmx.at>
-  2007, Alexander G. Balakhnin aka Fizick
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009 Free
 License: GPL-2+
  FIXME
 
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
+Files: configure
+Copyright: 1992-1996, 1998-2001, 2002-2009, Free Software Foundation,
 License: GPL-2+
  FIXME
 
@@ -779,32 +746,9 @@ Copyright: 2001-2004, Nemosoft Unv
 License: GPL-2+
  FIXME
 
-Files: lib/cmdline.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  2001-2007, Members of the gmerlin project\n"));
-License: GPL-2+
- FIXME
-
-Files: lib/gtk/aboutwindow.c
-Copyright: 2001, - 2011, Members of the Gmerlin project
-  \302\251 2001-2009, Members of the gmerlin project"));
-License: GPL-2+
- FIXME
-
 Files: COPYING
-Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
-  <year> <name of author>
-  are not
-  disclaimer" for the program, if necessary
-  if you do
-  law
-  law, except executing it on a
-  on the Program, and are irrevocable provided the stated
-  on the software, and (2) offer you this License
-  permission
-  permission, other than the making of an
-  treaty adopted on 20 December 1996, or
-License: GPL-ever
+Copyright: 2007, Free Software Foundation, Inc. <http:fsf.org/>
+License: GPL-ever GPL (vever)
  FIXME
 
 Files: include/float_cast.h
@@ -814,34 +758,16 @@ License: LGPL-2.1+
 
 Files: include/ladspa.h
 Copyright: 2000-2002, Richard W.E. Furse, Paul Barton-Davis
-  applying to the plugin. If no applies the
 License: LGPL-2.1+
  FIXME
 
-Files: apps/cmdlinerecorder/gmerlin-record.1
-Copyright: "=<string>"
-License: UNKNOWN
- FIXME
-
 Files: osd/GmerlinOSD.pfb
-Copyright: (http://fontforge.sf.net)
-  Created by Burkhard Plaum with FontForge 1.0
+Copyright: Created Burkhard Plaum with FontForge 1.0 %Copyright: (http:fontforge.sf.net)
 License: UNKNOWN
  FIXME
 
 Files: po/de.po
-Copyright: 2001-2007, Members of the gmerlin project\n"
-  2001-2007, Mitglieder des gmerlin projekts"
-  2001-2007, Mitglieder des gmerlin projekts\n"
-  2001-2009, Members of the gmerlin project"
-  2007, Members of the gmerlin project
-License: UNKNOWN
- FIXME
-
-Files: po/gmerlin.pot
-Copyright: 2001-2007, Members of the gmerlin project\n"
-  2001-2009, Members of the gmerlin project"
-  YEAR Members of the gmerlin project
+Copyright: 2007, Members of the gmerlin project
 License: UNKNOWN
  FIXME
 
@@ -850,8 +776,8 @@ Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: UNKNOWN
  FIXME
 
-Files: po/Makevars
-Copyright: for their translations to this person
+Files: po/gmerlin.pot
+Copyright: YEAR Members of the gmerlin project
 License: UNKNOWN
  FIXME
 

-- 
gmerlin packaging



More information about the pkg-multimedia-commits mailing list