[SCM] Debian packaging of libcrypt-cbc-perl branch, master, updated. 15d2e55c1cfed0ac6901d4b11215c5c9b50c62fd

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 29066ce55b6c6913beb8e85576840141960333da
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Wed Nov 21 06:01:42 2012 +0100

    Update d/copyright format

diff --git a/debian/changelog b/debian/changelog
index 2734981..cd76747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ libcrypt-cbc-perl (2.31-1) UNRELEASED; urgency=low
   * Remove README from docs
   * Bump Standards-Version to 3.9.4
   * Use debhelper 8
+  * Update debian/copyright format
 
  -- Xavier Guimard <x.guimard at free.fr>  Wed, 21 Nov 2012 05:51:45 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 22862af..a1b6307 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,33 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Lincoln Stein, lstein at cshl.org
-Upstream-Source: http://search.cpan.org/dist/Crypt-CBC/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Crypt-CBC
+Source: http://search.cpan.org/dist/Crypt-CBC/
+Upstream-Contact: Lincoln Stein <lstein at cshl.org>
 
 Files: *
-Copyright: Lincoln Stein, lstein at cshl.org
-License: Artistic
-    This module is distributed under the ARTISTIC LICENSE using the same
-    terms as Perl itself.
+Copyright: Lincoln Stein <lstein at cshl.org>
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: 
- 2003-2005, Gustavo Franco <stratus at debian.org>
- 2005-2008, members of the Debian Perl Group, cf. debian/changelog
-License: Artistic | GPL-1+
+Copyright: 2002-2003, Gustavo Franco <stratus at alternex.com.br>
+ 2003-2004, Gustavo Franco <stratus at acm.org>
+ 2005-2006, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+ 2005, Gustavo Franco <stratus at debian.org>
+ 2006-2008, gregor herrmann <gregoa at debian.org>
+ 2012, Xavier Guimard <x.guimard at free.fr>
+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 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 libcrypt-cbc-perl