r63852 - in /trunk/libxml-tidy-perl/debian: changelog copyright

Sun Oct 17 12:52:43 UTC 2010

Author: periapt-guest
Date: Sun Oct 17 12:51:52 2010
New Revision: 63852

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63852
Log:
Refreshed copyright

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

Modified: trunk/libxml-tidy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-tidy-perl/debian/changelog?rev=63852&op=diff
==============================================================================

--- trunk/libxml-tidy-perl/debian/changelog (original)
+++ trunk/libxml-tidy-perl/debian/changelog Sun Oct 17 12:51:52 2010
@@ -16,6 +16,7 @@
   * cleaned up rules and debhelper and quilt dependencies
   * Removed debian/README.source as quilt is now standard
   * echo '3.0 (quilt)' > debian/source/format
+  * Refreshed copyright
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Sat, 16 Oct 2010 23:05:22 +0100
 

Modified: trunk/libxml-tidy-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-tidy-perl/debian/copyright?rev=63852&op=diff
==============================================================================
--- trunk/libxml-tidy-perl/debian/copyright (original)
+++ trunk/libxml-tidy-perl/debian/copyright Sun Oct 17 12:51:52 2010
@@ -1,49 +1,97 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Pip Stuart <Pip at CPAN.Org>
-Upstream-Source: http://search.cpan.org/dist/XML-Tidy/
-Upstream-Name: XML-Tidy
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Pip Stuart <Pip at CPAN.Org>
+Source: http://search.cpan.org/dist/XML-Tidy/
+Name: XML-Tidy
 
 Files: *
-Copyright: Copyright: (c) 2004, Pip Stuart.
-License: GPL-2
+Copyright: 2004-2010, Pip Stuart.
+License: GPL-3
 
-Files: t/02large.t
-Copyright: The contained "RELAX NG schema for XHTML 2.0" is
- Copyright (C)2003-2004 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
+Files: t/02large.t (The contained "RELAX NG schema for XHTML 2.0")
+Copyright: 2003-2004, W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
 License: W3C-Software
- Permission to use, copy, modify and distribute this RELAX NG schema
- for XHTML 2.0 and its accompanying documentation for any purpose and
- without fee is hereby granted in perpetuity, provided that the above
- copyright notice and this paragraph appear in all copies. The copyright
- holders make no representation about the suitability of this RELAX NG
- schema for any purpose.
- .
- It is provided "as is" without expressed or implied warranty.
- For details, please refer to the W3C software license at:
- http://www.w3.org/Consortium/Legal/copyright-software
 
 Files: debian/*
-Copyright: 2009, Ryan Niebur <ryan at debian.org>
-License: Artistic | GPL-1+
+Copyright:
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
+ 2010, Nicholas Bamber <nicholas at periapt.co.uk>
+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
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
-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; version 2.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL-2'
+License: GPL-3
+ 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; version 3.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3'
+
+License: W3C-Software
+ By obtaining, using and/or copying this work, you (the licensee) agree
+ that you have read, understood, and will comply with the following
+ terms and conditions.
+ .
+ Permission to copy, modify, and distribute this software and its
+ documentation, with or without modification, for any purpose and
+ without fee or royalty is hereby granted, provided that you include the
+ following on ALL copies of the software and documentation or portions
+ thereof, including modifications:
+   * The full text of this NOTICE in a location viewable to users of the
+     redistributed or derivative work.
+   * Any pre-existing intellectual property disclaimers, notices, or
+     terms and conditions. If none exist, the W3C Software Short Notice
+     should be included (hypertext is preferred, text is permitted)
+     within the body of any redistributed or derivative code.
+   * Notice of any changes or modifications to the files, including the
+     date changes were made. (We recommend you provide URIs to the
+     location from which the code is derived.)
+ .
+ Disclaimers
+ .
+ THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+ HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+ DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ TRADEMARKS OR OTHER RIGHTS.
+ .
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+ OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+ DOCUMENTATION.
+ .
+ The name and trademarks of copyright holders may NOT be used in
+ advertising or publicity pertaining to the software without specific,
+ written prior permission. Title to copyright in this software and any
+ associated documentation will at all times remain with copyright
+ holders.
+ .
+ Notes
+ .
+ This version:
+ http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ .
+ This formulation of W3C's notice and license became active on December
+ 31 2002. This version removes the copyright ownership notice such that
+ this license can be used with materials other than those owned by the
+ W3C, reflects that ERCIM is now a host of the W3C, includes references
+ to this specific dated version of the license, and removes the
+ ambiguous grant of "use". Otherwise, this version is the same as the
+ previous version and is written so as to preserve the Free Software
+ Foundation's assessment of GPL compatibility and OSI's certification
+ under the Open Source Definition.
+


