merge patched into master

[python-simplemediawiki.debian] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index abf7a200b37e767fdd4d52f951a0d9c7a8c1518c..c23d66532dcee1f40b1094bd57d06a1dfa0ddebf 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,32 @@
 This work was packaged for Debian by:
 
 This work was packaged for Debian by:
 

-    Benjamin Mako Hill <mako@debian.org> on Fri, 11 Feb 2011 00:31:20 -0500
+  Benjamin Mako Hill <mako@debian.org> on Fri, 11 Feb 2011 00:31:20 -0500

 
 It was downloaded from:
 
 
 It was downloaded from:
 

-    <url://example.com>
+  http://pypi.python.org/pypi/simplemediawiki
+  http://github.com/ianweller/python-simplemediawikiOB

 
 

-Upstream Author(s):
+Upstream Author:

 
 

-    <put author's name and email here>
-    <likewise for another author>
+  Ian Weller <ian@ianweller.org>

 
 Copyright:
 
 
 Copyright:
 

-    <Copyright (C) YYYY Firstname Lastname>
-    <likewise for another author>
+  Copyright (C) 2010 Red Hat, Inc.

 
 License:
 
 
 License:
 

-### SELECT: ###
-    This package 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.
-### OR ###
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-##########
+  This library 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.

 
 

-    This package 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 2 can be found in "/usr/share/common-licenses/GPL-2".
+  On Debian systems, the complete text of the GNU Lesser General
+  Public License version 2.1 can be found in:
+  "/usr/share/common-licenses/LGPL-2.1".

 
 The Debian packaging is:
 
     Copyright (C) 2011 Benjamin Mako Hill <mako@debian.org>
 
 
 The Debian packaging is:
 
     Copyright (C) 2011 Benjamin Mako Hill <mako@debian.org>
 

-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.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.