r61617 - in /trunk/libdata-phrasebook-perl/debian: changelog copyright

[diocles at users.alioth.debian.org]

Author: diocles
Date: Sun Aug 15 16:30:46 2010
New Revision: 61617

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61617
Log:
Correct the upstream licensing

Modified:
    trunk/libdata-phrasebook-perl/debian/changelog
    trunk/libdata-phrasebook-perl/debian/copyright

Modified: trunk/libdata-phrasebook-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/debian/changelog?rev=61617&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/debian/changelog (original)
+++ trunk/libdata-phrasebook-perl/debian/changelog Sun Aug 15 16:30:46 2010
@@ -7,7 +7,9 @@
   * Added lintian override for spelling error
 
   [ Tim Retout ]
-  * debian/copyright: Add upstream copyright years.
+  * debian/copyright:
+    + Add upstream copyright years.
+    + Upstream is 'Artistic or GPL-1+', not 'GPL-2+'.
   * debian/libdata-phrasebook-perl.docs: Remove.
   * debian/libdata-phrasebook-perl.lintian-overrides: Remove.
   * debian/patches/fix-typo: New patch to fix typo picked up by lintian.

Modified: trunk/libdata-phrasebook-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/debian/copyright?rev=61617&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/debian/copyright (original)
+++ trunk/libdata-phrasebook-perl/debian/copyright Sun Aug 15 16:30:46 2010
@@ -6,20 +6,11 @@
 Files: *
 Copyright: 2003, Iain Truskett
  2004-2007, Barbie <barbie at cpan.org>
-License: GPL-2+
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: 2010, Nicholas Bamber <nicholas at periapt.co.uk>
-License: GPL-2+ or Artistic or GPL-1+
-
-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.
- .
- On Debian GNU/Linux systems, the complete text of version 2 of the GNU
- General Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License: Artistic or GPL-1+
 
 License: Artistic
  This program is free software; you can redistribute it and/or modify