[Pkg-octave-commit] [SCM] octave-splines branch, master, updated. 4b2438c002989e2751d640b76c598ccfaf3b7664

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 4b2438c002989e2751d640b76c598ccfaf3b7664
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 22 04:51:25 2009 +0200

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index d5ce0cd..9d31970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ octave-splines (1.0.7-1) UNRELEASED; urgency=low
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
   * debian/source.lintian-overrides: Add file for overriding Lintian
     warnings build-depends-without-arch-dep
-  * debian/copyright: Use DEP5 URL in Format-Specification
+  * debian/copyright:
+    + Use DEP5 URL in Format-Specification
+    + Use separate License stanzas for instructing about the location of
+      the different licenses used in the package
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:51:44 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 58e18dd..8450e2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,12 +6,10 @@ Upstream-Source: http://octave.sourceforge.net/splines/index.html
 Files: inst/csape.m
 Copyright: © 2000, 2001 Kai Habel
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/csapi.m, inst/fnder.m, inst/fnplt.m
 Copyright: © 2000 Kai Habel
 License: GPL-2+
- These *.m files are under the GPL, version 2 or later.
 
 Files: inst/fnval.m
 Copyright: © 2004 Paul Kienzle
@@ -21,9 +19,13 @@ License: PD
 Files: debian/*
 Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
 License: GPL-3+
- The Debian packaging information is under the GPL, version 3 or later.
 
-On Debian systems, the complete text of the GNU General Public License,
-version 2, can be found in the file `/usr/share/common-licenses/GPL-2. The
-complete text of the GNU General Public License, version 3, can be found
-in the file `/usr/share/common-licenses/GPL-3.
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 3, can be found in the file
+ `/usr/share/common-licenses/GPL-3'.

-- 
octave-splines