[SCM] Debian packaging of libconvert-asn1-perl branch, master, updated. debian/0.22-2

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit f12e3180d1e52ed14d8e945d28e567e6dba3507f
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Sep 17 11:02:52 2011 +0200

    debian/copyright: Formatting changes.

diff --git a/debian/copyright b/debian/copyright
index 649e17f..701371c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,15 @@
 Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=228
-Upstream-Name: Convert-ASN1
-Upstream-Maintainer: Graham Barr
-Upstream-Source: http://search.cpan.org/dist/Convert-ASN1/
+Name: Convert-ASN1
+Maintainer: Graham Barr
+Source: http://search.cpan.org/dist/Convert-ASN1/
 
 Files: *
 Copyright: © 2000-2005, Graham Barr <gbarr at pobox.com>
-License: GPL-1+ | Artistic
- This program is free software; you can redistribute it and/or modify it
- under the same terms as Perl itself.
- .
- Perl is distributed under your choice of the GNU General Public License or
- the Artistic License.  On Debian GNU/Linux systems, the complete text of the
- GNU General Public License can be found in `/usr/share/common-licenses/GPL'
- and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+License: Artistic or GPL-1+
 
 Files: inc/*
 Copyright: © 2002-2008, Brian Ingerson, Audrey Tang and Adam Kennedy.
-License: GPL-1+ | Artistic
- This program is free software; you can redistribute it and/or modify it under
- the same terms as Perl itself.
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright:
@@ -28,7 +19,20 @@ Copyright:
  © 2008,      Damyan Ivanov <dmn at debian.org>
  © 2008,      gregor herrmann <gregoa at debian.org>
  © 2008,      Ansgar Burchardt <ansgar at debian.org>
-License: GPL-1+ | Artistic
- It is assumed that all contributors put their work under the same license
- as the module itself.
+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 libconvert-asn1-perl