[SCM] Debian packaging of libcatalyst-manual-perl branch, master, updated. debian/5.9003-1-5-g2e02944

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 2e02944d56d493af62da4db33f96775aa574ae5b
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Fri May 4 22:41:27 2012 +0200

    Bumped Standards-Version to 3.9.3 (refreshing debian/copyright to use copyright-format 1.0)

diff --git a/debian/control b/debian/control
index aaef8dc..adb97e2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
  gregor herrmann <gregoa at debian.org>, Ansgar Burchardt <ansgar at debian.org>,
  Jonathan Yu <jawnsy at cpan.org>, Florian Schlichting <fschlich at zedat.fu-berlin.de>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://search.cpan.org/dist/Catalyst-Manual/
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libcatalyst-manual-perl.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libcatalyst-manual-perl.git
diff --git a/debian/copyright b/debian/copyright
index 0adcd5c..b7ab5ac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
-Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
-Maintainer: Kieren Diment
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Catalyst-Manual
+Upstream-Contact: Kieren Diment
 Source: http://search.cpan.org/dist/Catalyst-Manual/
-Name: Catalyst-Manual
 
 Files: *
 Copyright: 2005-2012, Sebastian Riedel <sri at cpan.org>, Catalyst Core Team
 License: Artistic or GPL-1+
-X-Comment: this data is copied directly from libcatalyst-perl; the POD
+Comment: this data is copied directly from libcatalyst-perl; the POD
  states that this distribution follows the same copyright as Catalyst
  itself.
 
@@ -14,7 +14,7 @@ Files: lib/Catalyst/Manual.pm
 Copyright: 2006, Jonathan Rockway <jrockway at cpan.org>
 License: Artistic or GPL-1+
 
-Files: lib/Catalyst/Manual/Tutorial.pod, lib/Catalyst/Manual/Tutorial/*
+Files: lib/Catalyst/Manual/Tutorial.pod lib/Catalyst/Manual/Tutorial/*
 Copyright: 2006-2011, Kennedy Clark <hkclark at gmail.com>
 License: CC-By-SA-3.0-US
 
@@ -23,16 +23,16 @@ Copyright: 2009, Gerda Shank <gshank at cpan.org>
 License: Artistic
 
 Files: inc/Module/*
-Copyright: 2002-2010, Adam Kennedy <adamk at cpan.org>
- 2002-2010, Audrey Tang <autrijus at autrijus.org>
- 2002-2010, Brian Ingerson <ingy at cpan.org>
+Copyright: 2002-2012, Adam Kennedy <adamk at cpan.org>
+ 2002-2012, Audrey Tang <autrijus at autrijus.org>
+ 2002-2012, Brian Ingerson <ingy at cpan.org>
 License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.org>
- 2009-2011, Ansgar Burchardt <ansgar at debian.org>
+Copyright: 2008, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
  2009-2011, gregor herrmann <gregoa at debian.org>
- 2008, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+ 2009-2011, Ansgar Burchardt <ansgar at debian.org>
+ 2009-2010, Jonathan Yu <jawnsy at cpan.org>
  2012, Florian Schlichting <fschlich at zedat.fu-berlin.de>
 License: Artistic or GPL-1+
 
@@ -43,15 +43,6 @@ License: Artistic
  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: CC-By-SA-3.0-US
  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
  CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
@@ -366,3 +357,13 @@ License: CC-By-SA-3.0-US
        additional provisions that may appear in any communication from
        You. This License may not be modified without the mutual
        written agreement of the Licensor and You.
+
+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 libcatalyst-manual-perl