[Pkg-octave-commit] [SCM] octave-nurbs branch, master, updated. d04b824d6b1b3051a22b1a4e88b589a6d4f6daa6

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index adf569f..6321123 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,6 @@ Upstream-Source: http://octave.sourceforge.net/nurbs/index.html
 Files: debian/*
 Copyright: © 2009 Rafael Laboissiere <rafael at debian.org>
 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'.
 
 Files: inst/basisfunder.m
 Copyright: © 2009 Rafael Vazquez
@@ -29,26 +26,31 @@ Copyright: © 2009 Carlo de Falco
 Files: inst/democurve.m, inst/demodercrv.m, inst/demotorus.m, inst/nrbdemo.m,
  inst/nrbextrude.m, inst/nrbruled.m, inst/nrbplot.m, inst/nrbrevolve.m
 Copyright: © 2003 Mark Spink
-License: GPL2+
+License: GPL-2+
 
 Files: inst/nrbbasisfunder.m, inst/nrbbasisfungradient.m, inst/nrbbasisfun.m
 Copyright: © 2009 Carlo de Falco
-License: GPL2+
+License: GPL-2+
 
 Files: inst/vecscale.m
 Copyright: © 2003 Mark Spink, 2007 Daniel Claxton
-License: GPL2+
+License: GPL-2+
 
 Files: inst/*.m
 Copyright: © 2000 Mark Spink
-License: GPL2+
+License: GPL-2+
 
 Files: src/*
 Copyright: © 2009 Carlo de Falco
            © 2003 Mark Spink, 2007 Daniel Claxton
-License: GPL2+
+License: GPL-2+
 
-License: GPL2+
+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-nurbs