[Pkg-octave-commit] [SCM] octave-fpl branch, master, updated. 22d025dc3dc77dd3e4a2edd36d9d554ef3c7c8b0

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index bd636f5..5c2a18a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,8 +6,6 @@ Upstream-Source: http://octave.sourceforge.net/fpl/index.html
 Files: debian/*
 Copyright: © 2008 Olafur Jens Sigurdsson <ojsbug at gmail.com>
 License: GPL-3+
- On Debian systems the full text of the GNU General Public License, version
- 3, can be found in the `/usr/share/common-licenses/GPL-3' file.
 
 Files: inst/FPL2pdeshowmesh*
        inst/FPL2ptcquiver.*
@@ -16,8 +14,6 @@ Files: inst/FPL2pdeshowmesh*
        inst/FPL2trsptcsurf.*
 Copyright: © 2004-2008  Culpo Massimiliano
 License: GPL-v2+
- On Debian systems the full text of the GNU General Public License, version
- 2, can be found in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: inst/FPL2dxappenddata.m
        inst/FPL2dxoutputdata.m
@@ -27,3 +23,13 @@ Files: inst/FPL2dxappenddata.m
        inst/FPL2ptcshowmesh.*
 Copyright: © 2004-2007  Carlo de Falco
 License: GPL-v2+
+
+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-fpl