r53140 - in /trunk/libhtml-tidy-perl/debian: changelog copyright

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Feb 21 17:26:02 2010
New Revision: 53140

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53140
Log:
debian/copyright: update formatting and years of upstream copyright.

Modified:
    trunk/libhtml-tidy-perl/debian/changelog
    trunk/libhtml-tidy-perl/debian/copyright

Modified: trunk/libhtml-tidy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/debian/changelog?rev=53140&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/debian/changelog (original)
+++ trunk/libhtml-tidy-perl/debian/changelog Sun Feb 21 17:26:02 2010
@@ -14,6 +14,9 @@
   [ Ryan Niebur ]
   * Update ryan52's email address
 
+  [ gregor herrmann ]
+  * debian/copyright: update formatting and years of upstream copyright.
+
  -- Jonathan Yu <jawnsy at cpan.org>  Sat, 20 Feb 2010 09:50:30 -0500
 
 libhtml-tidy-perl (1.08-1) unstable; urgency=low

Modified: trunk/libhtml-tidy-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/debian/copyright?rev=53140&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/debian/copyright (original)
+++ trunk/libhtml-tidy-perl/debian/copyright Sun Feb 21 17:26:02 2010
@@ -1,44 +1,45 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Andy Lester, <andy at petdance.com>
-Upstream-Source: http://search.cpan.org/dist/HTML-Tidy/
-Upstream-Name: HTML-Tidy
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Andy Lester <andy at petdance.com>
+Source: http://search.cpan.org/dist/HTML-Tidy/
+Name: HTML-Tidy
 
 Files: *
-Copyright: 2005-2007 by Andy Lester
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2005-2010, Andy Lester <andy at petdance.com>
+License: Artistic or GPL-1+
 
 Files: ppport.h
-Copyright: Version 2.x, Copyright (C) 2001, Paul Marquess.
- Version 1.x, Copyright (C) 1999, Kenneth Albanowski.
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan at gmx.net>
+ 2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
+ 1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
+License: Artistic or GPL-1+
 
 Files: t/unicode.t
 Copyright: 2006 Jonathan Rockway <jrockway at cpan.org>
 License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 X-Comment: This file does not have an explicit license. According to
  lib/HTML/Tidy.pm it is a contribution to the HTML-Tidy distribution,
  therefore the same license as for the rest of the module is assumed.
  Additionally putting code "under the same terms as Perl itself" is what the
  author usually does for his Perl code.
-
+  
 Files: debian/*
-Copyright: 2009, Ryan Niebur <ryan at debian.org>
-License: Artistic | GPL-1+
+Copyright: 2009, Ryan Niebur <ryanryan52 at gmail.com>
+ 2010, Jonathan Yu <jawnsy at cpan.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 GNU/Linux 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 GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'