[SCM] Debian packaging of Regexp-Assemble CPAN distribution branch, master, updated. debian/0.35-6-9-gfcd001b

[Xavier Guimard]

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

    Correct upstream lisense

diff --git a/debian/changelog b/debian/changelog
index 20ff88d..9425817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libregexp-assemble-perl (0.35-8) UNRELEASED; urgency=low
+
+  * Correct upstream lisense which is "Artistic or GPL-1+" and not "Artistic
+    or GPL-2"
+  * Bump Standards-Version to 3.9.4
+
+ -- Xavier Guimard <x.guimard at free.fr>  Sun, 21 Oct 2012 08:07:58 +0200
+
 libregexp-assemble-perl (0.35-7) unstable; urgency=low
 
   * Change description into a noun phrase
diff --git a/debian/control b/debian/control
index 5f7392e..68a568d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Xavier Guimard <x.guimard at free.fr>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libregexp-assemble-perl.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libregexp-assemble-perl.git
diff --git a/debian/copyright b/debian/copyright
index 2772a0a..db8063a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,19 +9,29 @@ License: GPL-2
 
 Files: *
 Copyright: 2004, 2005, 2006, 2007, 2008, 2011, David Landgren <david at landgren.net>
-License: Artistic or GPL-2
+License: Artistic or GPL-1+
 
 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'
+ 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 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
-    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-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; under version 2 of the License.
+ .
+ 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 Regexp-Assemble CPAN distribution