[SCM] Debian packaging of libmakefile-dom-perl branch, master, updated. c36e582578aed9d64a08d7a2992203be5f15c864

[gregor herrmann]

The following commit has been merged in the master branch:
commit f855356e85dd92f858b5b2d88b9667bf9144110b
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Aug 28 17:31:11 2011 +0200

    debian/copyright: update upstream information, bump DEP5 version and adjust
    formatting.

diff --git a/debian/copyright b/debian/copyright
index 88fa448..23c947f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,49 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Agent Zhang <agentzh at yahoo.cn>
-Upstream-Source: http://search.cpan.org/dist/Makefile-DOM/
-Upstream-Name: Makefile-DOM
+Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
+Maintainer: Zhang "agentzh" Yichun (章亦春) <agentzh at gmail.com>
+Source: http://search.cpan.org/dist/Makefile-DOM/
+Name: Makefile-DOM
 
 Files: *
-Copyright: 2006-2008, Agent Zhang
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2006-2011, Zhang "agentzh" Yichun (章亦春) <agentzh at gmail.com>
+License: Artistic or GPL-1+
 
 Files: lib/MDOM/*
 Copyright: 2001-2006, Adam Kennedy
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: inc/Test/*
 Copyright: 2006, 2008, 2009, Ingy döt Net
-Copyright: 2005, Brian Ingerson. All rights reserved.
-License-Alias: Perl
-License: Artistic | GPL-1+
+ 2005, Brian Ingerson. All rights reserved.
+License: Artistic or GPL-1+
 
 Files: inc/Spiffy.pm
 Copyright: 2006, Ingy döt Net
-Copyright: 2004, Brian Ingerson
-License-Alias: Perl
-License: Artistic | GPL-1+
+ 2004, Brian Ingerson
+License: Artistic or GPL-1+
 
 Files: inc/Module/*
-Copyright: 2002-2009, Adam Kennedy <adamk at cpan.org>
- 2002-2009, Audrey Tang <autrijus at autrijus.org>
- 2002-2009, Brian Ingerson <ingy at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2002-2011, Adam Kennedy <adamk at cpan.org>
+ 2002-2011, Audrey Tang <autrijus at autrijus.org>
+ 2002-2011, Brian Ingerson <ingy at cpan.org>
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: 2009, Mikhail Gusarov <dottedmag at dottedmag.net>
-License-Alias: Perl
-License: Artistic | GPL-1+
+ 2011, gregor herrmann <gregoa at debian.org>
+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 libmakefile-dom-perl