[SCM] Debian packaging of libiptables-parse-perl branch, master, updated. upstream/0.9-28-g6692c50

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 6692c50b4152ead1936fd8b0dc3bd6d47bf9f157
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Mon Feb 27 23:41:51 2012 +0100

    d/copyright:
    
    * d/copyright:
      + Updated using copyright-format 1.0
      + Changed Upstream-Maintainer in Upstream-Contact
      + Changed Upstream-Source in Source
      + Updated both licenses text
      + Changed "|" with "or" in license type
      + Added myself to debian/* copyright files
      + Updated year

diff --git a/debian/changelog b/debian/changelog
index 02cc00f..f88371e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,14 @@ libiptables-parse-perl (0.9-1) UNRELEASED; urgency=low
   * Changed Homepage to default search.cpan.org
   * debian/watch: fix CPAN URL, and drop the other location
   * Removed {Breaks,Replaces}: psad (<= 2.1.2-1) from d/control
-
+  * d/copyright:
+    + Updated using copyright-format 1.0
+    + Changed Upstream-Maintainer in Upstream-Contact
+    + Changed Upstream-Source in Source
+    + Updated both licenses text
+    + Changed "|" with "or" in license type
+    + Added myself to debian/* copyright files
+    + Updated year  
 
  -- Franck Joncourt <franck at debian.org>  Mon, 27 Feb 2012 23:12:48 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 9a46559..535c396 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,29 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Name: IPTables::Parse
-Upstream-Maintainer: Michael B. Rash <mbr at cipherdyne.com>
-Upstream-Source: http://www.cipherdyne.com/modules/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Michael Rash <mbr at cipherdyne.org>
+Source: http://search.cpan.org/dist/IPTables-Parse/
+Upstream-Name: IPTables-Parse
 
 Files: *
-Copyright: Copyright 2005-2008 by Michael B. Rash <mbr at cipherdyne.com>
-License: GPL-1+ | Artistic
- This library is free software; you can redistribute it and/or modify it
- under the same terms as Perl itself.
- .
- Perl is distributed under the GNU General Public License, either version 1 or
- (at your option) any later version, and the Artistic License.
- .
- On Debian systems, the complete text of the GNU General Public License can be
- found in /usr/share/common-licenses/GPL and the Artistic License in
- /usr/share/common-licenses/Artistic.
+Copyright: 2005-2012, Michael Rash <mbr at cipherdyne.org>
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: Copyright 2008 by Franck Joncourt <franck at debian.org>
-License: GPL-1+ | Artistic
- Debian packaging is licensed under the same terms as Perl itself.
+Copyright: 2008, Franck Joncourt <franck at debian.org>
+ 2012, Fabrizio Regalli <fabreg at fabreg.it>
+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 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'.

-- 
Debian packaging of libiptables-parse-perl