r67107 - in /trunk/libquota-perl/debian: changelog copyright

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Thu Jan  6 17:55:38 2011
New Revision: 67107

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=67107
Log:
* Refresh patches and forward where necessary
* Refreshed copyright
* Corrected license stanza on afsquota.c to 'Artistic or GPL-2+'
  and removed X-Comment
   Explanation: Between 1995-2001 this module was in the public domain.
   Since then it has been published under either the Artistic license or
   the GPL version 2. By version 1.60 (Oct 2007) the copyright situation
   had been largely resolved, except for the file afsquota.c. As documented
   in the RT ticket #28599, the maintainer clarified that the file
   was no longer in the public domain. However this was not correctly
   reflected in the Debian copyright file. This version attempts to 
   accurately reflect the status quo.

Modified:
    trunk/libquota-perl/debian/changelog
    trunk/libquota-perl/debian/copyright

Modified: trunk/libquota-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libquota-perl/debian/changelog?rev=67107&op=diff
==============================================================================
--- trunk/libquota-perl/debian/changelog (original)
+++ trunk/libquota-perl/debian/changelog Thu Jan  6 17:55:38 2011
@@ -1,8 +1,4 @@
 libquota-perl (1.6.5+dfsg-1) UNRLEASED; urgency=low
-
-  TODO:
-  unconfuse the confusing license of afsquota.c a bit further. probably:
-  remove paragraph from d/copyright and explan why in d/changelog
 
   [ Nicholas Bamber ]
   * Added myself to Uploaders
@@ -10,14 +6,18 @@
   * Refresh debian/source/format
   * Upped standards version to 3.9.1
   * Removed explicit references to quilt
-  * Refresh patches and forward where necessary.
-  * Refreshed copyright.
-    - Note: Confusingly previous versions of this Debian package
-    give the files afsquota.c both a copyright notice and a public domain
-    license. My understanding is that this makes no sense, but that if it 
-    is in the public domain then we are entitled to distribute it with a 
-    license. Accordingly I have changed the license for this file to 
-    Artistic or GPL-2.
+  * Refresh patches and forward where necessary
+  * Refreshed copyright
+  * Corrected license stanza on afsquota.c to 'Artistic or GPL-2+'
+    and removed X-Comment
+     Explanation: Between 1995-2001 this module was in the public domain.
+     Since then it has been published under either the Artistic license or
+     the GPL version 2. By version 1.60 (Oct 2007) the copyright situation
+     had been largely resolved, except for the file afsquota.c. As documented
+     in the RT ticket #28599, the maintainer clarified that the file
+     was no longer in the public domain. However this was not correctly
+     reflected in the Debian copyright file. This version attempts to 
+     accurately reflect the status quo.
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Thu, 06 Jan 2011 08:37:12 +0000
 

Modified: trunk/libquota-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libquota-perl/debian/copyright?rev=67107&op=diff
==============================================================================
--- trunk/libquota-perl/debian/copyright (original)
+++ trunk/libquota-perl/debian/copyright Thu Jan  6 17:55:38 2011
@@ -12,14 +12,11 @@
 
 Files: include/quotaio_xfs.h
 Copyright: 2000, Silicon Graphics, Inc.
-License: GPL-2   
+License: GPL-2+  
 
 Files: afsquota.c:
 Copyright: 1998-2003, Wolfgang Friebel <friebel at ifh.de>
-License: Artistic or GPL-2
-X-Comment:
- This file was contributed when this software was in the Public domain
- For details, see: http://rt.cpan.org/Public/Bug/Display.html?id=28599
+License: Artistic or GPL-2+
 
 Files: debian/*
 Copyright: