[SCM] gmerlin-avdecoder/master: Update debian/copyright

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7974040a8c1bb8159734439896348a2dd814a0dd
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Mar 5 11:14:37 2012 +0100

    Update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index d245b66..b42fcc2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,45 +1,47 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: gmerlin_avdecoder
-Maintainer: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gmerlin_avdecoder
+Upstream-Contact:
+ Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 Source: http://gmerlin.sourceforge.net/
 
+Files: *
 Copyright: 1995-2001,2004-2006, Free Software Foundation, Inc.
-	2000-2002, the xine project
-	2001-2011, Members of the Gmerlin project
-	2003-2009, Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
+           2000-2002, the xine project
+           2001-2011, Members of the Gmerlin project
+           2003-2009, Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
 License: GPL-2+
 
-Files: ./config.rpath,
-	./m4/*.m4,
+Files: config.rpath,
+ m4/*.m4,
 Copyright: 1995-2006, Free Software Foundation, Inc
 License: other-GAP
 
-Files: ./lib/targa.[ch]
+Files: lib/targa.[ch]
 Copyright: 2001-2003, Emil Mikulic
 License: other-targa
 
-Files: ./lib/base64.c
+Files: lib/base64.c
 Copyright: 1991, Bell Communications Research, Inc. (Bellcore)
 	1998-2000, University College London
-License: BSD-3 and other-Bellcore
+License: BSD-3-clause and other-Bellcore
 
-Files: ./include/RTjpeg.[ch]
+Files: include/RTjpeg.[ch]
 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>
+           1999, Wim Taymans <wim.taymans at tvd.be>
+           Justin Schoeman 1998 <justin at suntiger.ee.up.ac.za>
 License: LGPL-2.1+
 
-Files: ./po/Makefile.in.in
+Files: po/Makefile.in.in
 Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: other-GAP-gettext
 
-Files: ./debian/*
+Files: debian/*
 Copyright: 2008, Christian Marillat <marillat at debian.org>
-	2009, Romain Beauxis <toots at rastageeks.org>
-	2009-2010, Reinhard Tartler <siretart at tauware.de>
-	2010, Jonas Smedegard <dr at jones.dk>
-	2010-2011, IOhannes m zmölnig <zmoelnig at iem.at>
-	2011, Alessio Treglia <alessio at debian.org>
+           2009, Romain Beauxis <toots at rastageeks.org>
+           2009-2010, Reinhard Tartler <siretart at tauware.de>
+           2010, Jonas Smedegard <dr at jones.dk>
+           2010-2011, IOhannes m zmölnig <zmoelnig at iem.at>
+           2011-2012, Alessio Treglia <alessio at debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -52,7 +54,7 @@ License: GPL-2+
  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.
- .
+Comment:
  On Debian systems, the complete text of the GNU General Public License
  (GPL) version 2 can be found in "/usr/share/common-licenses/GPL-2".
  .
@@ -71,16 +73,15 @@ License: LGPL-2.1+
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  General Public License for more details.
- .
+Comment:
  On Debian systems, the complete text of the GNU Lesser General Public
  License (LGPL, formerly named GNU Library General Public License)
  version 2.1 can be found in '/usr/share/common-licenses/LGPL-2.1'.
  .
  You should have received a copy of the GNU Lesser General Public
- License along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
+ License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: BSD-3
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, is permitted provided that the following conditions are
  met:

-- 
gmerlin-avdecoder packaging