r14688 - in /trunk/libxml-mini-perl/debian: changelog copyright

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

Author: gregoa-guest
Date: Sun Feb 10 03:28:08 2008
New Revision: 14688

URL: http://svn.debian.org/wsvn/?sc=1&rev=14688
Log:
debian/copyright:
  - add upstream source location
  - update copyright & license terms from README

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

Modified: trunk/libxml-mini-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/changelog?rev=14688&op=diff
==============================================================================
--- trunk/libxml-mini-perl/debian/changelog (original)
+++ trunk/libxml-mini-perl/debian/changelog Sun Feb 10 03:28:08 2008
@@ -3,8 +3,11 @@
   * New upstream release.
   * Ignore conflicting patches directly applied to upstream source,
     hopefully not breaking too much.
+  * debian/copyright:
+    - add upstream source location
+    - update copyright & license terms from README
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 10 Feb 2008 04:19:04 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 10 Feb 2008 04:23:47 +0100
 
 libxml-mini-perl (1.2.8-4) unstable; urgency=low
 

Modified: trunk/libxml-mini-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/copyright?rev=14688&op=diff
==============================================================================
--- trunk/libxml-mini-perl/debian/copyright (original)
+++ trunk/libxml-mini-perl/debian/copyright Sun Feb 10 03:28:08 2008
@@ -1,40 +1,40 @@
 This is the debian package for the XML::Mini perl module.
 It was created by Raphael Hertzog <hertzog at debian.org>.
 
-The upstream author is: Patrick Deegan
+Upstream source location: http://minixml.psychogenic.com
 
-Copyright:
+Copyright & License:
 
-Copyright (C) 2002-2003 Patrick Deegan, Psychogenic Inc.
+Programs that use this code are bound to the terms and conditions of the GNU GPL (see the LICENSE file). 
+If you wish to include these modules in non-GPL code, you need prior written authorisation 
+from the authors.
 
-Programs that use this code are bound to the terms and conditions of the GNU
-GPL. If you wish to include these modules in non-GPL code, you need prior
-written authorisation from the authors.
 
-        XML::Mini module, part of the XML::Mini XML parser/generator package.
-        Copyright (C) 2002, 2003 Patrick Deegan,  Psychogenic.com
-        All rights reserved
+This library is released under the terms of the GNU GPL version 3, making it available only for 
+free programs ("free" here being used in the sense of the GPL, see http://www.gnu.org for more details). 
+Anyone wishing to use this library within a proprietary or otherwise non-GPLed program MUST contact psychogenic.com to 
+acquire a distinct license for their application.  This approach encourages the use of free software 
+while allowing for proprietary solutions that support further development.
+
+
+    LICENSE
+
+    XML::Mini XML parser/generator package.
+    Copyright (C) 2002-2008 Patrick Deegan
+    All rights reserved
     
-        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 of the License, or
-        (at your option) any later version.
+    XML::Mini 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 3 of the License, 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.
+    XML::Mini 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.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-	02110-1301 USA.
-
-Official XML::Mini site: http://minixml.psychogenic.com
-
-Contact page for author available at
-http://www.psychogenic.com/
-
+    You should have received a copy of the GNU General Public License
+    along with XML::Mini.  If not, see <http://www.gnu.org/licenses/>.
 
 The full text of the GPL is available on Debian systems in
 /usr/share/common-licenses/GPL