[SCM] gavl packaging branch, master, updated. debian/1.1.2-1-3-g0849db1

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

The following commit has been merged in the master branch:
commit c5a70ddbba42a7c0b6e3f7599f5e149e59df4aba
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Fri Mar 26 14:16:29 2010 +0100

    Update debian/copyright as per DEP-5 spec.

diff --git a/debian/copyright b/debian/copyright
index e37c4f6..c2afca7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,50 +1,55 @@
-This package was debianized by Christian Marillat <marillat at debian.org> on
-Mon, 28 Jul 2008 09:29:33 +0200.
-
-It was downloaded from http://gmerlin.sourceforge.net/
-
-Upstream Author: 
-
-    Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=142
+Name: Gmerlin Audio Video Library
+Maintainer: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+Source: http://sourceforge.net/projects/gmerlin/files/gavl/
 
+Files: *
 Copyright:
-
-File mmx/mmx.h has copyright:
-    Copyright © 2000-2001 Michel Lespinasse <walken at zoy.org>
-    Copyright © 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
-
-Files libgdither/gdither.{c,h} and libgdither/gdither_types.h have copyright:
-    Copyright © 2002 Steve Harris <steve at plugin.org.uk>
-
-Files in libsamplerate/ have copyright:
-    Copyright © 2001-2008 Erik de Castro Lopo <erikd at mega-nerd.com>
-
-File include/float_cast.h has copyright:
-    Copyright © 2001-2002 Erik de Castro Lopo <erikd at zip.com.au>
-
-File include/samplerate.h has copyright:
-    Copyright © 2002-2004 Erik de Castro Lopo <erikd at mega-nerd.com>
-
-File include/attributes.h has copyright:
-    Copyright © 2000-2001 Michel Lespinasse <walken at zoy.org>
-    Copyright © 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
-
-Other files have the following copyright:
-    Copyright © 2001 - 2008 Members of the Gmerlin project
-    
-License:
-
-    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 2 of the License, or
-    (at your option) any later version.
-
-    You should have received a copy of the GNU General Public License with the
-    Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; if
-    not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
-    Floor, Boston, MA 02110-1301, USA.
-
-The Debian packaging is
- © 2010, Alessio Treglia <quadrispro at ubuntu.com>
- © 2008, Christian Marillat <marillat at debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
+ 2001-2010 Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+License: GPL-2+
+
+Files: gavl/mmx/mmx.h
+Copyright: 2000-2001 Michel Lespinasse <walken at zoy.org>
+           1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+License: GPL-2+
+
+Files gavl/libgdither/*
+Copyright: 2002 Steve Harris <steve at plugin.org.uk>
+License: GPL-2+
+
+Files: gavl/libsamplerate/*
+Copyright: 2001-2008 Erik de Castro Lopo <erikd at mega-nerd.com>
+License: GPL-2+
+
+File: include/float_cast.h
+Copyright: 2001-2002 Erik de Castro Lopo <erikd at zip.com.au>
+
+Files: include/samplerate.h
+Copyright: 2002-2004 Erik de Castro Lopo <erikd at mega-nerd.com>
+
+Files: include/attributes.h
+Copyright: 2000-2001 Michel Lespinasse <walken at zoy.org>
+           1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+
+Files: debian/*
+Copyright: 2010 Alessio Treglia <quadrispro at ubuntu.com>
+           2008-2009 Romain Beauxis <toots at rastageeks.org>
+           2008 Christian Marillat <marillat at debian.org>
+License: GPL-2+
+
+License: GPL-2
+ 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 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.
+X-Comment: On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL-2 file.

-- 
gavl packaging