[SCM] Debian packaging of libhtml-fillinform-perl branch, master, updated. 302a6832c9e254b089f0b3a53290418017006255

[gregor herrmann]

The following commit has been merged in the master branch:
commit 7573cd4ecf8296d0a1677caf61ec26522b7a1d1d
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Aug 30 19:02:52 2011 +0200

    debian/copyright: update formatting, point to GPL-1 symlink, update years of
    upstream and packaging copyright.

diff --git a/debian/copyright b/debian/copyright
index 59aa951..bdec0a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,30 @@
-Upstream source location: http://search.cpan.org/dist/HTML-FillInForm
+Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
+Maintainer: Thomas J. Mather, tjmather at maxmind.com
+Source: http://search.cpan.org/dist/HTML-FillInForm/
+Name: HTML-FillInForm
 
 Files: *
-Copyright: Copyright (c) 2002-2007 Thomas J. Mather, tjmather at maxmind.com
-License: GPL-1+ | Artistic
- All rights reserved. This package is free software; you can
- redistribute it and/or modify it under the same terms as Perl itself -
- dual-licensed under the GNU General Public License, version 1 or (at
- your option) any later version, and the Perl Artistic License.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL, and the complete text
-of the Artistic License in /usr/share/common-licenses/Artistic
+Copyright: 2002-2011, Thomas J. Mather, tjmather at maxmind.com
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright:
-  Copyright (c) 2005, 2006 Gunnar Wolf <gwolf at debian.org>
-  Copyright (c) 2007 Damyan Ivanov <dmn at debian.org>
-  Copyright (c) 2008 gregor herrmann <gregoa at debian.org>
-License: GPL-1+ | Artistic
- Debian packaging is licensed under the same terms as the software itself.
+Copyright: 2005, 2006, Gunnar Wolf <gwolf at debian.org>
+ 2007, Damyan Ivanov <dmn at debian.org>
+ 2008-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 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 libhtml-fillinform-perl