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

Xavier Guimard x.guimard at free.fr
Sun Oct 21 06:07:30 UTC 2012


The following commit has been merged in the master branch:
commit 009addc85d1ee67d08e579804aa42d1cdc02ef08
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Oct 21 08:07:02 2012 +0200

    Correct GPL-2 paragraph

diff --git a/debian/changelog b/debian/changelog
index 31c85a6..ac19231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,9 @@
-libapache-session-browseable-perl (0.8-1) UNRELEASED; urgency=low
-
-  TODO:
-  - d/copyright: contradiction "License: GPL-2" and "either version 2, or (at
-    your option) any later version." either it's GPL-2+ or the "any later
-    version" must be removed
+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+"
+  * Correct GPL-2 paragraph
 
  -- Xavier Guimard <x.guimard at free.fr>  Wed, 17 Oct 2012 05:50:22 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c2bf290..b83dfa4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,8 +30,8 @@ License: 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; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; under version 2 of the License.
  .
- On Debian systems, the complete text of version 2 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+

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



More information about the Pkg-perl-cvs-commits mailing list