[SCM] gmerlin/master: Update debian/copyright.

Mon Jun 11 11:47:42 UTC 2012

The following commit has been merged in the master branch:
commit cdec0036dcf4ff481580f3d6ce4941b280c66fa3
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 13:47:34 2012 +0200

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 0890c0f..730834c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=200
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gmerlin
 Upstream-Contact: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 Source: http://gmerlin.sourceforge.net/
@@ -12,13 +12,30 @@ Copyright:
  1985-2009, Free Software Foundation, Inc
 License: GPL-3+
 
-Files: apps/*/*.[ch],
- plugins/*/*.[ch],
- lib/*.c,
- lib/*/*.c
- include/*.h,
+Files:
+ apps/*/*.[ch]
+ include/md5.h
+ include/*.h
  include/*/*.h
-Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+ lib/*.c
+ lib/*/*.c
+ lib/md5.c
+ missing
+ depcomp
+ config.guess
+ config.sub
+ doc/mdate-sh
+ plugins/*/*.[ch]
+ icons/*.png
+ doc/img/*.png
+Copyright:
+ 2001-2011, Members of the Gmerlin project <gmerlingeneral at lists.sourceforge.net>
+ 2006, Michael Niedermayer <michaelni at gmx.at>
+ 2007, Alexander G. Balakhnin aka Fizick
+ 2004, Luc Saillard (luc at saillard.org)
+ 2003, Jakub 'jimmac' Steiner
+ 2001-2004, Nemosoft Unv
+ 1995-2006, Free Software Foundation, Inc
 License: GPL-2+
 
 Files: doc/*
@@ -34,48 +51,20 @@ Files: plugins/image/targa.[ch]
 Copyright: 2001-2003, Emil Mikulic
 License: other-targa
 
-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
-License: GPL-2+
-
-Files: include/md5.h,
- lib/md5.c,
- missing,
- depcomp,
- config.guess,
- config.sub,
- doc/mdate-sh
-Copyright: 1995-2006, Free Software Foundation, Inc
-License: GPL-2+
-
 Files: lib/uthread_sem.c
 Copyright: 2000, Jason Evans <jasone at freebsd.org>
 License: BSD-2-clause
 
-Files: plugins/v4l/pwc-ioctl.h
-Copyright: 2001-2004, Nemosoft Unv,
- 2004, Luc Saillard (luc at saillard.org)
-License: GPL-2+
-
-Files: include/float_cast.h
-Copyright: 2001-2002, Erik de Castro Lopo <erikd at zip.com.au>
-License: LGPL-2.1+
-
-Files: include/ladspa.h
-Copyright: 2000-2002, Richard W.E. Furse, Paul Barton-Davis
+Files: include/float_cast.h include/ladspa.h
+Copyright:
+ 2000-2002, Richard W.E. Furse, Paul Barton-Davis
+ 2001-2002, Erik de Castro Lopo <erikd at zip.com.au>
 License: LGPL-2.1+
 
 Files: po/Makefile.in.in
 Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: other-GAP-gettext
 
-Files: icons/*.png, doc/img/*.png
-Copyright: 2003, Jakub 'jimmac' Steiner
- 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
-License: GPL-2+
-
 Files: plugins/cdaudio/sha1.[ch]
 Copyright: - (2001 The Bitzi Corporation, Uwe Hollerbach)
 License: Public Domain
@@ -92,33 +81,37 @@ 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.
-Comment: On Debian systems, the complete text of the GNU General Public
+Comment:
+ On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  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
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ .
  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
-  License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
@@ -130,14 +123,12 @@ License: LGPL-2.1+
  but 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:
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
  On Debian systems, the complete text of the GNU Lesser 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: GFDL-1.1
  Permission is granted to copy, distribute and/or modify this document 

-- 
gmerlin packaging

