[Pkg-octave-commit] r1227 - semidef-oct/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-02-23 11:15:03 +0000 (Sat, 23 Feb 2008)
New Revision: 1227

Modified:
   semidef-oct/trunk/debian/changelog
   semidef-oct/trunk/debian/copyright
   semidef-oct/trunk/debian/rules
Log:
Extended licensing notices

Modified: semidef-oct/trunk/debian/changelog
===================================================================
--- semidef-oct/trunk/debian/changelog	2008-02-23 10:49:09 UTC (rev 1226)
+++ semidef-oct/trunk/debian/changelog	2008-02-23 11:15:03 UTC (rev 1227)
@@ -11,8 +11,10 @@
   * debian/control:
     + Removed Cyril Brulebois from the list of Uploaders at his request
     + Use the Vcs-* headers instead of the deprecated XS-Vcs-* ones
+  * debian/copyright: Add more comments about the licensing terms of the
+    different parts of the package
 
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 23 Jan 2008 23:45:24 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 12:11:26 +0100
 
 semidef-oct (1:2003-5) unstable; urgency=low
 

Modified: semidef-oct/trunk/debian/copyright
===================================================================
--- semidef-oct/trunk/debian/copyright	2008-02-23 10:49:09 UTC (rev 1226)
+++ semidef-oct/trunk/debian/copyright	2008-02-23 11:15:03 UTC (rev 1227)
@@ -12,14 +12,20 @@
 Some minor changes were made which are documented in the file
 	/usr/share/doc/octave-sp/changelog.Debian.gz.
 
-The semidef package contains the following statement in the file COPYRIGHT:
+This package is curently maintained by the Debian Octave Group
+(http://pkg-octave.alioth.debian.org).
 
-    COPYRIGHT 1994 LIEVEN VANDENBERGHE AND STEPHEN BOYD
+The semidef package contains the following statement in the file COPYRIGHT
+and in the src/*.c files:
+
+    Copyright (c) 1994 by Lieven Vandenberghe and Stephen Boyd.
+
     Permission to use, copy, modify, and distribute this software for
     any purpose without fee is hereby granted, provided that this entire
     notice is included in all copies of any software which is or includes
     a copy or modification of this software and in all copies of the
     supporting documentation for such software.
+
     This software is being provided "as is", without any express or
     implied warranty.  In particular, the authors do not make any
     representation or warranty of any kind concerning the merchantability
@@ -47,8 +53,36 @@
 [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=435214#45
 [3] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=435214#55
 
-The additional code by A. S. Hodel is released under the GNU GPL. On a
-Debian GNU/Linux systems, the complete text of GNU General Public License
-can be found in the file /usr/share/common-licenses/GPL.  The complete text
-of GNU Lesser General Public License can be found in the file
-/usr/share/common-licenses/LGPL.
+The additional code by A. S. Hodel is released under the following terms:
+
+# Copyright (C) 1996 A. Scottedward Hodel
+#
+# This file is part of Octave.
+#
+# Octave 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, or (at your option) any
+# later version.
+#
+# Octave 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 Octave; see the file COPYING.  If not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+The Debian packaging is:
+
+# Copyright (C) 1998 - 2003 by Dirk Eddelbuettel <edd at debian.org>
+# Copyright (C) 2005 - 2008 by Rafael Laboissiere <rafael at debian.org>
+
+and is released under the terms of the GNU GPL, version 3 or later.
+
+On a Debian GNU/Linux systems, the complete text of GNU General Public
+License can be found in the file /usr/share/common-licenses/GPL-2
+(version 2) and /usr/share/common-licenses/GPL-3 (version 3).  The
+complete text of GNU Lesser General Public License can be found in the
+file /usr/share/common-licenses/LGPL.

Modified: semidef-oct/trunk/debian/rules
===================================================================
--- semidef-oct/trunk/debian/rules	2008-02-23 10:49:09 UTC (rev 1226)
+++ semidef-oct/trunk/debian/rules	2008-02-23 11:15:03 UTC (rev 1227)
@@ -2,7 +2,7 @@
 #                                                       -*- makefile -*-
 # debian/rules file for the Debian/GNU Linux octave-sp package
 # Copyright (C) 1998 - 2003 by Dirk Eddelbuettel <edd at debian.org>
-# Copyright (C) 2005 by Rafael Laboissiere <rafael at debian.org>
+# Copyright (C) 2005 - 2008 by Rafael Laboissiere <rafael at debian.org>
 
 include /usr/share/dpatch/dpatch.make
 include /usr/share/octave/debian/defs.make