[Pkg-sdl-commits] [SCM] Packaging of SDL_net branch, master, updated. debian/1.2.7-5-7-g1bfeb8c

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit dbbad46c7b9ca8ba3af1f8da6913018d53531350
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Fri Jan 20 14:51:29 2012 +0000

    Update copyright file according to the switch from LGPL to zlib/libpng license

diff --git a/debian/copyright b/debian/copyright
index bd5e0a0..c1f215d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,31 +2,40 @@ Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: SDL_net
 Upstream-Contact: Sam Lantinga <slouken at libsdl.org>
 		  Roy Wood <roy at centricsystems.ca>
+		  Masahiro Minami <elsur at aaa.letter.co.jp>
 Source: http://www.libsdl.org/projects/SDL_net/
 
+
 Files: *
-Copyright: 1997-2004 Sam Lantinga
-License: LGPL-2+
+Copyright: 1997-2012 Sam Lantinga <slouken at libsdl.org>
+License: zlib/libpng
 
-Files: chat.cpp
-Copyright: 1997-2004 Sam Lantinga
-License: GPL-2+
 
 Files: debian/*
-Copyright: 2011, Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
+Copyright: 2011-2012, Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
 	   2003-2007 Mike Furr <mfurr at debian.org>
 	   2001, Branden Robinson <branden at debian.org>
 	   2001-2002 Arthur Korn <arthur at korn.ch>  Thu, 12 Dec 2002 01:07:18 +0100
 License: LGPL-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; version 2 dated June, 1991, or (at your
- option) any later version.
+
+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.
  .
- 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'.
+ 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: LGPL-2+
  This program is free software; you can redistribute it and/or modify
@@ -36,4 +45,3 @@ License: LGPL-2+
  .
  On Debian systems, the complete text of version 2 of the GNU Lesser
  Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-

-- 
Packaging of SDL_net