[SCM] gmerlin-encoders/master: Regenerated debian/{control, copyright_hints}

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a36cdaa1206b2403a0805be18d49809d5c70ef64
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Jan 31 14:19:14 2014 +0100

    Regenerated debian/{control,copyright_hints}

diff --git a/debian/control b/debian/control
index 079aebc..30c53e8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,17 @@ Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders:
  Alessio Treglia <alessio at debian.org>,
- IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>,
+ IOhannes m zmölnig <zmoelnig at iem.at>,
  Jonas Smedegaard <dr at jones.dk>
 Homepage: http://gmerlin.sourceforge.net/
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Build-Depends:
  cdbs,
  autotools-dev,
  gnulib,
  debhelper (>= 9~),
  dh-buildinfo,
+ dh-autoreconf,
  devscripts,
  libavcodec-dev,
  libavformat-dev,
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 7880c06..7546301 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -16,14 +16,17 @@ Files: ABOUT-NLS
  configure.ac
  cpuinfo.sh
  cvs_clean.sh
+ debian/README.source
  debian/compat
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/gmerlin-encoders-extra.install
  debian/gmerlin-encoders-ffmpeg.install
  debian/gmerlin-encoders-good.install
  debian/patches/fix_typos.patch
  debian/patches/libav.patch
+ debian/patches/plugins-ldflags.patch
  debian/patches/series
  debian/restorefiles
  debian/source/format
@@ -198,11 +201,16 @@ Copyright: YEAR Members of the gmerlin project
 License: UNKNOWN
  FIXME
 
+Files: install-sh
+Copyright: 1994, X Consortium
+License: Expat
+ FIXME
+
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
   (ISLOWER ? ( | 0x40) : )
   1992-1996, 1998-2001,
-  1996-2001, 2003-2005
+  1996-2001, 2003-2005,
   2009, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
@@ -210,7 +218,7 @@ License: GPL-2+
 Files: aclocal.m4
 Copyright: 1996-1997, 2000-2001, 2003, 2005,
   1996-1997, 2000-2001, 2003, 2005, 2008
-  1996-2001, 2003-2005
+  1996-2001, 2003-2005,
   1996-2004,
   1997, 1999-2001, 2003-2005, 2008
   1997, 2000-2001, 2003-2006, 2008
@@ -251,17 +259,8 @@ License: GPL-2+
 Files: COPYING
 Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
   <year> <name of author>
-  HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
   are not
   disclaimer" for the program, if necessary
-  holder as a result of your choosing to follow a
-  holder explicitly and
-  holder is
-  holder is reinstated (a)
-  holder notifies you of the
-  holder who authorizes use under this
-  holder, and you cure the violation prior to 30 days after
-  holders of
   if you do
   law
   law, except executing it on a
@@ -273,11 +272,6 @@ Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
 License: GPL-ever
  FIXME
 
-Files: install-sh
-Copyright: 1994, X Consortium
-License: MIT/X11 (BSD like)
- FIXME
-
 Files: po/Makefile.in.in
 Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: UNKNOWN
@@ -285,9 +279,6 @@ License: UNKNOWN
 
 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-encoders packaging