[Pkg-octave-commit] [SCM] octave-linear-algebra branch, master, updated. c60a5a366e04971f2bca2b4ba0fee09bbf7f311d

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index 8d89aea..84629a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,27 +6,22 @@ Upstream-Source: http://octave.sourceforge.net/linear-algebra/index.html
 Files: inst/thfm.m,
 Copyright: © 2001 Rolf Fabian
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/funm.m
 Copyright: © 2000 P.R. Nienhuis
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/bicg.m
 Copyright: © 2006 Sylvain Pelissier
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/condeig.m
 Copyright: © 2006, 2007 Arno Onken
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: src/GramSchmidt.cc
 Copyright: © 2002 Andreas Stahel
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: src/dbleGSVD.h, src/dbleGSVD.h, src/CmplxGSVD.cc,
  src/CmplxGSVD.cc, src/CmplxGSVD.h, src/CmplxGSVD.h, src/gsvd.cc,
@@ -34,14 +29,17 @@ Files: src/dbleGSVD.h, src/dbleGSVD.h, src/CmplxGSVD.cc,
 Copyright: © 1996, 1997 John W. Eaton
            © 2006 Pascal Dupuis
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 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-linear-algebra