[SCM] Debian packaging of libpoe-component-jabber-perl branch, master, updated. cad36c5ea458ab4289560b5043f530eff94c4d00

[Salvatore Bonaccorso]

The following commit has been merged in the master branch:
commit cad36c5ea458ab4289560b5043f530eff94c4d00
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Tue Aug 9 22:17:20 2011 +0200

    update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index e065bcd..faa0bc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,15 @@ libpoe-component-jabber-perl (3.00-2) UNRELEASED; urgency=low
     - Add DEP3 headers to fix-pod-docs-for-names.patch.
     - Add use-Digest-SHA.patch to use Digest::SHA from perl core instead
       of Digest::SHA1.
-
- -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 09 Aug 2011 21:57:59 +0200
+  * debian/copyright:
+    - Update Format-Specification to revision 135 for DEP5 proposal for
+      machine-readable copyright file.
+    - Correct upstreams license information (it is GPL-2 in source).
+    - Refer to Debian systems in general instead of only Debian GNU/Linux
+      systems.
+    - Explicitly refer to GPL-1 license text in common-licenses.
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 09 Aug 2011 22:16:39 +0200
 
 libpoe-component-jabber-perl (3.00-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index c70312f..21cfc39 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Name: POE-Component-Jabber
 
 Files: *
 Copyright: 2003-2009 Nicholas Perez
-License: GPL-1+
+License: GPL-2
 
 Files: debian/*
 Copyright: 2005, Florian Ragwitz <rafl at debianforum.de>,
@@ -13,16 +13,26 @@ Copyright: 2005, Florian Ragwitz <rafl at debianforum.de>,
  debian/changelog
 License: 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.
+ .
+ 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'.
+
 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 GNU/Linux systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL'
+ 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'. 

-- 
Debian packaging of libpoe-component-jabber-perl