[SCM] gavl/master: Update copyright information.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Jan 9 11:16:25 UTC 2011


The following commit has been merged in the master branch:
commit 4ed15f5bda78657d2025cd61e92b686c5a02c564
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jan 9 12:15:48 2011 +0100

    Update copyright information.

diff --git a/debian/copyright b/debian/copyright
index 6e96f6c..9f7abae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,12 @@ Maintainer: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.ne
 Source: http://sourceforge.net/projects/gmerlin/files/gavl/
 
 Copyright:
- 2001-2010 Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+ 2001-2011 Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+License: GPL-2+
+
+Files: ./gavl/memcpy.c
+Copyright: 2001-2004 the xine project
+           2001 - 2011 Members of the Gmerlin project]
 License: GPL-2+
 
 Files: ./gavl/mmx/mmx.h
@@ -24,6 +29,11 @@ File: ./include/float_cast.h
 Copyright: 2001-2002 Erik de Castro Lopo <erikd at zip.com.au>
 License: GPL-2+
 
+Files: ./include/arith128.h, ./gavl/arith128.c
+Copyright: 2001-2011 Members of the Gmerlin project
+           2004 Linas Vepstas <linas at linas.org>
+License: GPL-2+
+
 Files: ./include/samplerate.h
 Copyright: 2002-2004 Erik de Castro Lopo <erikd at mega-nerd.com>
 License: GPL-2+
@@ -33,6 +43,25 @@ Copyright: 2000-2001 Michel Lespinasse <walken at zoy.org>
            1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
 License: GPL-2+
 
+Files: ./include/bswap.h
+Copyright: 2006 Michael Niedermayer <michaelni at gmx.at>
+License: LGPL-2.1+
+ FFmpeg is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ FFmpeg 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with FFmpeg; 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 Lesser General
+ Public License can be found in /usr/share/common-licenses/LGPL-2.1 file.
+
 Files: ./debian/*
 Copyright: 2010-2011 Alessio Treglia <alessio at debian.org>
            2008-2009 Romain Beauxis <toots at rastageeks.org>

-- 
gavl packaging



More information about the pkg-multimedia-commits mailing list