[Pkg-sdl-commits] [SCM] Debian packaging of SDL_mixer project branch, master, updated. debian/1.2.11-7-9-g6c0b401

Fri Jan 20 23:59:57 UTC 2012

The following commit has been merged in the master branch:
commit f7a452274bcb7bb3a5e7181d780e6d54e5ebdbca
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Fri Jan 20 15:53:56 2012 +0000

    Update copyright file because of the switch from LGPL to zlib/libpng license, and better document timidity (which is under 3 licenses, but primarily Artistic)

diff --git a/debian/copyright b/debian/copyright
index f0b61bc..b4dc757 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,52 +1,40 @@
 Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: SDL_mixer
 Upstream-Contact: Sam Lantinga <slouken at libsdl.org>
+		  Stephane Peter <megastep at megastep.org>
+		  Ryan Gordon <icculus at icculus.org>
 Source: http://www.libsdl.org/projects/SDL_mixer/
 
 Files: *
-Copyright: 1997-2004 Sam Lantinga
-License: LGPL-2.1+
+Copyright: 1997-2012 Sam Lantinga <slouken at libsdl.org>
+License: zlib/libpng
 
-Files: native_midi_gpl/*
-Copyright: 1994-1996 Nathan I. Laredo
-License: LGPL-2.1
-Comment: Note: the native MIDI support for Linux/BSD, made by Nathan Laredo
- <laredo at gnu.org> and Peter Kutak <kutak at stonline.sk> is now licensed
- under the LGPL, as show the following mail logs:
- .
- 	Message-ID: <20031021214042.48127.qmail at web10906.mail.yahoo.com>
- 	Date: Tue, 21 Oct 2003 14:40:42 -0700 (PDT)
- 	From: Nathan <linuxdvd at yahoo.com>
- 	Subject: Re: playmidi licensing
- 	To: Josselin Mouette <joss at debian.org>
- .
-  As of today, I'm placing the current and all previous versions of playmidi
-  under the LGPL.   I will make an announcement on the sourceforge site
-  shortly.
- .
-  -- Nathan Laredo
-  laredo at gnu.org
- .
- 	Subject: Bug#200735: playmidi licensing
- 	Date: Sat, 25 Oct 2003 09:35:10 +0200
- 	From: Kutak <kutak at stonline.sk>
- 	To: 200735 at bugs.debian.org
- 	Message-id: <000f01c39aca$86b9ca20$adb051d5 at doma>
- .
-  I agree to put my modifications for support native midi for SDL_mixer under
-  LGPL.
+Files: native_midi/*
+Copyright: 2000,2001 Florian 'Proff' Schulze <florian.proff.schulze at gmx.net>
+	   2001 Max Horn <max at quendi.de>
+License: zlib/libpng
 
-Files: native_midi_gpl/awe_voice.h
-Copyright: 1996,1997 Takashi Iwai
-License: GPL-2+
+Files: native_midi/native_midi_macosx.c
+Copyright: 2009 Ryan C. Gordon <icculus at icculus.org>
+License: zlib/libpng
 
-Files: native_midi/*
-Copyright: 2000,2001 Florian 'Proff' Schulze & Max Horn
-           2009 Ryan C. Gordon
-License: LGPL-2.1+
+Files: native_midi/native_midi_haiku.cpp
+Copyright: 2010 Egor Suvorov <egor_suvorov at mail.ru>
+License: zlib/libpng
+
+Files: timidity/*
+Copyright: 1995 Tuukka Toivonen <toivonen at clinet.fi>
+License: Artistic, GPL-2+, LGPL-2.1+
+Comment: From README
+ From http://www.cgs.fi/~tt/discontinued.html :
+ .
+ If you'd like to continue hacking on TiMidity, feel free. I'm
+ hereby extending the TiMidity license agreement: you can now
+ select the most convenient license for your needs from (1) the
+ GNU GPL, (2) the GNU LGPL, or (3) the Perl Artistic License.
 
 Files: debian/*
-Copyright: 2011, Manuel A. Fernandez Montecelo
+Copyright: 2011-2012, Manuel A. Fernandez Montecelo
            2011, Roman Vasiyarov <rvasiyarov at gmail.com>
            2010, Jon Dowland <jmtd at debian.org>
            2009, Barry deFreese <bdefreese at debian.org>
@@ -57,9 +45,23 @@ Copyright: 2011, Manuel A. Fernandez Montecelo
            2001, Branden Robinson <branden at debian.org>
 License: LGPL-2.1+
 
-Files: timidity/*
-Copyright: 1995 Tuukka Toivonen <toivonen at clinet.fi>
-License: GPL-2+
+
+License: zlib/libpng
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
@@ -70,14 +72,6 @@ License: GPL-2+
  On Debian systems, the complete text of version 2 of the GNU General
  Public License can be found in '/usr/share/common-licenses/GPL-2'.
 
-License: LGPL-2.1
- This program 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; version 2.1 of the License.
- .
- On Debian systems, the complete text of version 2.1 of the GNU Lesser
- Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
 License: LGPL-2.1+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
@@ -85,5 +79,11 @@ License: LGPL-2.1+
  your option) any later version.
  .
  On Debian systems, the complete text of version 2.1 of the GNU Lesser
- Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+ Public License can be found in '/usr/share/common-licenses/LGPL-2.1'.
 
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Perl Artistic License, available in COPYING.
+ .
+ On Debian systems, the complete text of version 2.1 of the Artistic License can
+ be found in '/usr/share/common-licenses/Artistic'.

-- 
Debian packaging of SDL_mixer project

