[SCM] lame/master: Update debian/copyright. This includes changes about the LGPL clarifications and helpful comments about some of the files. This needed an update to latest DEP-5 spec.

Wed Jul 27 01:13:01 UTC 2011

The following commit has been merged in the master branch:
commit 76d13255b457f18a482095d862e4443f44befa58
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Jul 26 21:02:43 2011 -0400

    Update debian/copyright.
    This includes changes about the LGPL clarifications and helpful comments about
    some of the files. This needed an update to latest DEP-5 spec.

diff --git a/debian/copyright b/debian/copyright
index 44f6eeb..2403c1e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,7 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: LAME
-Maintainer: Mike Cheng <http://www.uq.net.au/~zzmcheng>
-            Mark Taylor <http://www.mp3dev.org/>
-Download: http://lame.sourceforge.net/
-
-Copyright: © 1998-2003, the LAME developers, see rest of this file for detailed list
-License: GPL-2
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=markup
+Upstream-Name: LAME
+Upstream-Contact: lame-dev at lists.sourceforge.net
+Source: http://lame.sourceforge.net/
 
 Files: *
 Copyright: © 1998, Michael Cheng
@@ -22,21 +18,12 @@ Copyright: © 1998, Michael Cheng
            © 2000-2008, Gabriel Bouvigne
            © 2000-2008, Robert Hegemann
            © 2000, Don Melton
+           © 2000, Frank Klemm
            © 2001-2002, Naoki Shibata
            © 2001, John Dahlstrom
            © 2001, Jonathan Dee
            © 2003, Olcios
-License: LGPL-2+ | other
- This code is distributed under the GNU LESSER PUBLIC LICENSE
- (LGPL, see www.gnu.org) with the following modification:
- .
- 1. If you determine that distribution of LAME requires a patent license,
-    and you obtain a patent license, you may distribute LAME even though
-    redistribution of LAME may also require a patent license.
- .
- 2. You agree not to enforce any patent claims for any aspect of
-    MPEG audio compression, or any other techniques contained in
-    the LAME source code.
+License: LGPL-2+
 
 Files: ACM/*,
        libmp3lame/gain_analysis.{c,h}
@@ -110,14 +97,27 @@ License: other
  This code may be used and freely distributed as long as it includes
  this copyright notice and the warranty information.
 
-Files: libmp3lame/i386/nasm.h
-Copyright: © 1999, URURI
-License: n/a
+Files: libmp3lame/i386/*
+Copyright: © 1999, Keiichi SAKAI
+           © 1999, shigeo
+           © 1999, URURI
+License: LGPL-2+
+Comment:
+ Though the license information is not explicitely given, these files are from
+ an open source MP3 encoder named gogo-no-coda, which is based off of LAME.
+ The gogo-no-coda developers (the developers mentioned above) have released
+ their work under LGPL-2. A copy of the source code to gogo-no-coda can be
+ downloaded from http://homepage2.nifty.com/kei-i/petit/petit313.tgz (as of
+ 07-26-2011).
 
 Files: libmp3lame/fft.c
 Copyright: © 1988-1993, Ron Mayer
            © 1999-2000, Takehiro Tominaga
-License: GPL-2 | other
+License: GPL-1+
+Comment:
+ No version of the GPL is explicitely given. A note about the licensing of this
+ file is given, and repeated verbatim below.
+ .
  NOTE: This routine uses at least 2 patented algorithms, and may be
        under the restrictions of a bunch of different organizations.
        Although I wrote it completely myself; it is kind of a derivative
@@ -143,17 +143,27 @@ License: GPL-2 | other
            Mather    - idea of using lookup table
            Takehiro  - some dirty hack for speed up
 
-Files: mpglib/*
-Copyright: © 1995-1997, Michael Hipp
-           © 2000, Albert L. Faber
-License: GPL-2+
-
 Files: debian/*
 Copyright: © 2005-2009, Fabian Greffrath <fabian+debian at greffrath.com>
-License: GAP
- Copying and distribution of the Debian packaging, with or without modification,
- are permitted in any medium without royalty provided the copyright
- notice and this notice are preserved.
+           © 2009-2011, Andres Mejia <amejia at debian.org>
+License: LGPL-2+
+
+License: GPL-1+
+ 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 1 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/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 1 can be found in `/usr/share/common-licenses/GPL-1'.
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
@@ -166,9 +176,8 @@ License: GPL-2+
  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.
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
@@ -184,11 +193,10 @@ License: LGPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
  .
- You should have received a copy of the GNU Library 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
+ You should have received a copy of the GNU Library General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU Lesser General
+ On Debian systems, the complete text of the GNU Library General
  Public License can be found in `/usr/share/common-licenses/LGPL-2'.
 
 License: LGPL-2.1+
@@ -202,9 +210,8 @@ License: LGPL-2.1+
  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 this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 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/>.
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.

-- 
lame packaging

