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

[umlaeute at users.alioth.debian.org]

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

    Regenerated debian/control|copyright_hints

diff --git a/debian/control b/debian/control
index 33457d2..fe7e4f8 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  libtheora-dev,
  libvorbis-dev
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gmerlin-encoders.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/gmerlin-encoders.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/gmerlin-encoders.git
 
 Package: gmerlin-encoders-ffmpeg
 Architecture: any
diff --git a/debian/copyright_hints b/debian/copyright_hints
index e78cd9b..f2e04fe 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -21,9 +21,11 @@ Files: ABOUT-NLS
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/git-tuneclone.sh
  debian/gmerlin-encoders-extra.install
  debian/gmerlin-encoders-ffmpeg.install
  debian/gmerlin-encoders-good.install
+ debian/patches/ffmpeg_2.9.patch
  debian/patches/fix_typos.patch
  debian/patches/libav.patch
  debian/patches/libav10.patch
@@ -52,6 +54,7 @@ Files: ABOUT-NLS
  plugins/yuv4mpeg/Makefile.am
  po/ChangeLog
  po/LINGUAS
+ po/Makevars
  po/POTFILES.in
  po/Rules-quot
  po/boldquot.sed
@@ -183,16 +186,17 @@ Files: Makefile.in
  plugins/ogg/Makefile.in
  plugins/yuv4mpeg/Makefile.in
  utils/Makefile.in
-Copyright: 1994-2002
+Copyright: 1994-2002, 2003-2009, Free Software Foundation,
 License: UNKNOWN
  FIXME
 
-Files: config.guess
+Files: aclocal.m4
+ config.guess
  config.sub
  missing
-Copyright: 1992-1999,
-  1992-2001
-  1996-1997, 1999-2000, 2002-2006
+Copyright: 1992-1999, 2000-2009, 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
 
@@ -204,46 +208,17 @@ License: UNKNOWN
 
 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
+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
 
@@ -258,19 +233,8 @@ 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: po/Makefile.in.in
@@ -278,8 +242,3 @@ 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
-License: UNKNOWN
- FIXME
-

-- 
gmerlin-encoders packaging