[Pkg-jed-commit] r1062 - slcurl/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-16 19:30:17 +0000 (Sun, 16 Mar 2008)
New Revision: 1062

Modified:
   slcurl/trunk/debian/changelog
   slcurl/trunk/debian/copyright
Log:
Add proper licensing conditions, both upstream and for the Debian packaging

Modified: slcurl/trunk/debian/changelog
===================================================================
--- slcurl/trunk/debian/changelog	2008-03-16 19:25:36 UTC (rev 1061)
+++ slcurl/trunk/debian/changelog	2008-03-16 19:30:17 UTC (rev 1062)
@@ -1,8 +1,10 @@
 slcurl (0.2.1-3) UNRELEASED; urgency=low
 
   * debian/control: Fix spelling of S-Lang
+  * debian/copyright: Add proper licensing conditions, both upstream and
+    for the Debian packaging
 
- -- Rafael Laboissiere <rafael at debian.org>  Sun, 16 Mar 2008 20:25:11 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 16 Mar 2008 20:29:47 +0100
 
 slcurl (0.2.1-2) unstable; urgency=low
 

Modified: slcurl/trunk/debian/copyright
===================================================================
--- slcurl/trunk/debian/copyright	2008-03-16 19:25:36 UTC (rev 1061)
+++ slcurl/trunk/debian/copyright	2008-03-16 19:30:17 UTC (rev 1062)
@@ -5,12 +5,34 @@
 
     ftp://space.mit.edu/pub/davis/slang/v2.0/modules/
 
-Copyright Holder:   John E. Davis <davis at space.mit.edu>
+Author: John E. Davis <davis at space.mit.edu>
 
 License:
 
-  The S-Lang cURL module is released under the GNU General Public License
-  version 2.
+    Copyright (C) 2005, 2006, 2007 John E. Davis
 
-  In Debian systems, the complete text of the GPL can be found in
-  `/usr/share/common-licenses/GPL-2'.
+    This file is part of the S-Lang Curl Module
+
+    The S-Lang Curl Module 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.
+
+    The S-Lang Curl Module 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 library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+    USA.
+
+The Debian packaging is Copyright (C) 2005 - 2008 Rafael Laboissiere
+and is released under the GNU General Public License, version 3 or
+later.
+
+In Debian systems, the complete text of the GPL, versions 2 and 3, can
+be found in `/usr/share/common-licenses/GPL-2' and
+`/usr/share/common-licenses/GPL-3'.
+