[SCM] gmerlin-encoders/master: Updated copyright using final DEP-5 format

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

The following commit has been merged in the master branch:
commit e7d4c96760c7725ac3f77d4e688e852e1cc3719d
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 17:22:47 2012 +0200

    Updated copyright using final DEP-5 format

diff --git a/debian/copyright b/debian/copyright
index 426ef9f..aaacaef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,17 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=162
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gmerlin-encoders
 Upstream-Contact: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 Source: http://sourceforge.net/projects/gmerlin/files/gmerlin-encoders/
 Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
-Disclaimer: Autogenerated by CDBS snippet copyright-check.mk
 
-Files: *
+Files: * m4/check_funcs.m4
 Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 License: GPL-3+
 
+Files: m4/avcodec.m4 m4/avformat.m4 m4/lqt_opt_cflags.m4
+Copyright: 2004-2005, Burkhard Plaum
+License: GPL-3+
+
 Files: include/*.h
  lib/*.c
  plugins/*/*.[ch]
@@ -25,7 +28,7 @@ Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: other-GAP-gettext
 
 Files: debian/*
-Copyright: 2011, IOhannes m zmölnig <zmoelnig at iem.at>
+Copyright: 2011-2012, IOhannes m zmölnig <zmoelnig at iem.at>
  2011 Alessio Treglia <alessio at debian.org>
 License: GPL-2+
 
@@ -34,12 +37,12 @@ License: GPL-2+
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
-
+ .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
-
+ .
  You should have received a copy of the GNU General Public License along
  with this program; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -51,12 +54,12 @@ License: GPL-3+
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
-
+ .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
-
+ .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Comment: On Debian systems, the complete text of the GNU General Public
@@ -77,6 +80,6 @@ License: other-GAP
 
 License: other-GAP-gettext
  This file may be copied and used freely without restrictions.  It may
- be used in projects which are not available under a GNU Public License,
- but which still want to provide support for the GNU gettext
+ be used in projects which are not available under the GNU General Public
+ License, but which still want to provide support for the GNU gettext
  functionality.

-- 
gmerlin-encoders packaging