[Python-modules-commits] r2579 - in /packages/pyqwt5/trunk/debian: changelog copyright

[gudjon-guest at users.alioth.debian.org]

Author: gudjon-guest
Date: Tue Jun 19 07:48:49 2007
New Revision: 2579

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2579
Log:
Fixed errors in the copyright file

Modified:
    packages/pyqwt5/trunk/debian/changelog
    packages/pyqwt5/trunk/debian/copyright

Modified: packages/pyqwt5/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pyqwt5/trunk/debian/changelog?rev=2579&op=diff
==============================================================================
--- packages/pyqwt5/trunk/debian/changelog (original)
+++ packages/pyqwt5/trunk/debian/changelog Tue Jun 19 07:48:49 2007
@@ -1,6 +1,7 @@
 pyqwt5 (5.0.0-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #413372)
-  * Added the Qwt licence to the copyright file.
+  * Added the Qwt licence to the copyright file and fixed
+    some errors in it.
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 18 Jun 2007 23:29:01 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 19 Jun 2007 09:46:03 +0200

Modified: packages/pyqwt5/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/pyqwt5/trunk/debian/copyright?rev=2579&op=diff
==============================================================================
--- packages/pyqwt5/trunk/debian/copyright (original)
+++ packages/pyqwt5/trunk/debian/copyright Tue Jun 19 07:48:49 2007
@@ -8,39 +8,35 @@
 Copyright: 	© 2001-2007 Gerard Vermeulen
 		© 2000 Mark Colclough
 
-License: 		PyQwt3D LICENSE
-                     Version 1, Septembre 2006
+License: 		PyQwt LICENSE
+                     Version 3, March 2006
 
-PyQwt3D is free software; you can redistribute it and/or modify
+PyQwt 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.
 
-PyQwt3D is distributed in the hope that it will be useful,
+PyQwt 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 PyQwt3D; if not, write to the Free Software Foundation, Inc.,
+with PyQwt; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 In addition, as a special exception, Gerard Vermeulen gives permission
-to link PyQwt3D dynamically with non-free versions of Qt and PyQt,
-and to distribute PyQwt3D in this form, provided that equally powerful
+to link PyQwt dynamically with non-free versions of Qt and PyQt,
+and to distribute PyQwt in this form, provided that equally powerful
 versions of Qt and PyQt have been released under the terms of the GNU
 General Public License.
 
-If PyQwt3D is dynamically linked with non-free versions of Qt and PyQt,
-PyQwt3D becomes a free plug-in for a non-free program.
+If PyQwt is dynamically linked with non-free versions of Qt and PyQt,
+PyQwt becomes a free plug-in for a non-free program.
 
+Note from Gudjon: The PyQwt Licence is equal to the PyQwt3D license.
 
-The Debian packaging is (C) 2007, Gudjon I. Gudjonsson <gudjon at gudjon.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-
-The package contains Qwt
-http://qwt.sourceforge.net/
+The package contains Qwt http://qwt.sourceforge.net/
 Qwt is distributed under the Qwt license.
                              Qwt License
                            Version 1.0, January 1, 2003