[SCM] Debian packaging of libhtml-wikiconverter-dokuwiki-perl branch, master, updated. 8df7053f156d69a522eabf1279a6e9a5c8a3c9b5

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit a4b8b5b1503d8a27ee6b3dd7cd70a16ae3633b11
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jan 8 16:50:05 2012 +0100

    Rewrite copyright file using draft DEP-5 syntax.

diff --git a/debian/copyright b/debian/copyright
index 7053622..0af30c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,44 @@
-This is perl module HTML::WikiConverter::DokuWiki packaged for Debian
-GNU systems.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: HTML::WikiConverter::DokuWiki
+Upstream-Contact: David J. Iberri <diberri at cpan.org>
+Source: http://search.cpan.org/dist/HTML-WikiConverter-DokuWiki/
 
-Upstream source: http://www.cpan.org/modules/by-module/HTML/
+Files: *
+Copyright: 2006-2007, David J. Iberri <diberri at cpan.org>
+License: Artistic or GPL-1+
+ This library is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
+Comment:
+ Perl is licensed under either the 'Artistic license' or the 'GNU
+ General Public License' version 1 or later.
 
 Files: debian/*
-Copyright: © 2008 Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-License: GPL-any
+Copyright: 2007-2008, 2012, Jonas Smedegaard <dr at jones.dk>
+License: GPL-2+
 
-Files: *
-Copyright: © 2006 David J. Iberri <diberri at cpan.org>
-License: GPL-any | Artistic
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
+License: Artistic
+Comment:
+ On Debian systems the 'Artistic License' is located in
+ '/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+Comment:
+ On Debian systems the 'GNU General Public License' version 1 is located
+ in '/usr/share/common-licenses/GPL-1'.
 
-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: GPL-2+
+ 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 2, or (at your option) any
+ later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+Comment:
+ On Debian systems the 'GNU General Public License' version 2 is located
+ in '/usr/share/common-licenses/GPL'.
+ .
+ You should have received a copy of the 'GNU General Public License'
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
Debian packaging of libhtml-wikiconverter-dokuwiki-perl