[Pkg-octave-commit] [SCM] octave-tsa branch, master, updated. 0fd3c011a868ead3604871450a3be2325b0cc5fe

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 83fe89e..400a415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 octave-tsa (4.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * 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, 17 May 2009 22:48:02 +0200
 
diff --git a/debian/copyright b/debian/copyright
index ea7b5df..806f176 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,39 +6,41 @@ Upstream-Source: http://octave.sourceforge.net/tsa/index.html
 Files: inst/*.m (see exceptions below)
 Copyright: © 1996-2008  Alois Schloegl
 License: LGPL-2+
- These files are under the LGPL, version 2 or later.
 
 Files: inst/contents.m, inst/flag_implicit_samplerate.m, inst/flix.m,
  inst/y2res.m
 Copyright: © 1996-2005  Alois Schloegl
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/mvaar.m
 Copyright: © 2001, 2002  Christian Kasess
            © 2003  Alois Schloegl
 License: LGPL-2+
- This file is under the LGPL, version 2 or later.
 
 Files: inst/rmle.m
 Copyright: © 2004  Jose Luis Gutierrez
 License: LGPL-2+
- This file is under the LGPL, version 2 or later.
 
 Files: inst/detrend.m
 Copyright: © 1995, 1996  Kurt Hornik
            © 2001, 2007  Alois Schloegl
 License: LGPL-2+
- This file is under the LGPL, version 2 or later.
 
 Files: debian/*
 Copyright: © 2008 Rafael Laboissiere
 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. The complete text of the GNU
-Library Public License, version 2, can be found in the file
-`/usr/share/common-licenses/LGPL-2.
+
+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: LGPL-2+
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License, version 2, can be found in the file
+ `/usr/share/common-licenses/LGPL-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-tsa