[SCM] Debian packaging of Apache-Session-Browseable CPAN distribution branch, master, updated. debian/0.7-1-10-g7e05441

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 7e0544158cc7494d7af7630be107400c01c526ad
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sat Oct 20 08:02:30 2012 +0200

    Correct copyright

diff --git a/debian/changelog b/debian/changelog
index 1cdf07a..a02121d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,8 @@
-libapache-session-browseable-perl (0.8-1) UNRELEASED; urgency=low
-
-  TODO:
-  - d/copyright: what is the license of this module? README says "same as
-    perl" (= Artistic or GPL-1+), d/copyright says "Artistic or GPL-2"
-    (and d/copyright has "any later option" which is wrong with GPL-2)
+libapache-session-browseable-perl (0.8-1) unstable; urgency=low
 
   * New upstream release
   * Bump Standard-Version to 3.9.4
+  * Correct upstream copyright : "Artistic or GPL-1+"
 
  -- Xavier Guimard <x.guimard at free.fr>  Wed, 17 Oct 2012 05:50:22 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 952b29d..c2bf290 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ License: GPL-2
 
 Files: *
 Copyright: 2009, 2010, 2012 Xavier Guimard <x.guimard at free.fr>
-License: Artistic or GPL-2
+License: Artistic or GPL-1+
 
 License: Artistic
  This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,15 @@ License: Artistic
  On Debian 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 systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/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

-- 
Debian packaging of Apache-Session-Browseable CPAN distribution