r42047 - in /trunk/libfile-next-perl/debian: changelog copyright

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Aug 18 08:32:29 2009
New Revision: 42047

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42047
Log:
Quote upstream license statement verbatim

Modified:
    trunk/libfile-next-perl/debian/changelog
    trunk/libfile-next-perl/debian/copyright

Modified: trunk/libfile-next-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-next-perl/debian/changelog?rev=42047&op=diff
==============================================================================
--- trunk/libfile-next-perl/debian/changelog (original)
+++ trunk/libfile-next-perl/debian/changelog Tue Aug 18 08:32:29 2009
@@ -23,6 +23,7 @@
 
   [ Damyan Ivanov ]
   * Standards-Version: 3.8.3 (no changes)
+  * Quote upstream license statement verbatim
 
  -- Ansgar Burchardt <ansgar at 43-1.org>  Sat, 01 Aug 2009 14:43:31 +0200
 

Modified: trunk/libfile-next-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-next-perl/debian/copyright?rev=42047&op=diff
==============================================================================
--- trunk/libfile-next-perl/debian/copyright (original)
+++ trunk/libfile-next-perl/debian/copyright Tue Aug 18 08:32:29 2009
@@ -7,25 +7,22 @@
 
 Files: *
 Copyright: © 2005-2009, Andy Lester
-License: GPL-1+ | Artistic
+License: GPL-1+ | Artistic-2.0
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of either:
+  * the GNU General Public License as published by the Free
+    Software Foundation; either version 1, or (at your option) any later
+    version, or
+  * the Artistic License version 2.0.
+ .
+ On Debian systems, the complete text of the Artistic License can be found in 
+ `/usr/share/common-licenses/Artistic' and the complete text of the GNU 
+ General Public License can be found in `/usr/share/common-licenses/GPL'
+
 
 Files: debian/*
 Copyright:
  © 2007, Peter Makholm <peter at makholm.net>
  © 2008, Damyan Ivanov <dmn at debian.org>
  © 2009, Ansgar Burchardt <ansgar at 43-1.org>
-License: GPL-1+ | Artistic
-
-License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
-
-License: GPL-1+
-    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; either version 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+License: GPL-1+ | Artistic-2.0