[Pkg-octave-commit] [SCM] octave-statistics branch, master, updated. 97d9216e78322fba2a7bc0e70b0be27b32178c62

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index 739e707..9ef51dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,40 +5,33 @@ Upstream-Source: http://octave.sourceforge.net/statistics/index.html
 
 Files: inst/anovan.m
 Copyright: © 2003-2005 Andy Adler
-License: GPL-2
- This file is under the GPL, version 2 or later.
+License: GPL-2+
 
 Files: inst/linkage.m, inst/pdist.m, inst/squareform.m
 Copyright: © 2006, 2008  Bill Denney
-License: GPL-3
- These *.m files are under the GPL, version 3 or later.
+License: GPL-3+
 
 Files: inst/regress.m
 Copyright: © 2005, 2006 William Poetra Yoga Hadisoeseno
-License: GPL-3
- This file is under the GPL, version 3 or later.
+License: GPL-3+
 
 Files: inst/random.m
 Copyright: © 2007 Søren Hauberg
-License: GPL-3
- This file is under the GPL, version 3 or later.
+License: GPL-3+
 
 Files: inst/geomean.m, inst/harmmean.m, inst/mad.m, inst/nanmax.m,
  inst/nanmean.m, inst/nanmedian.m, inst/nanmin.m, inst/nanstd.m,
  inst/nansum.m, inst/prctile.m, inst/trimmean.m, inst/zscore.m
 Copyright: © 2001 Paul Kienzle
-License: GPL-2
- These *.m files are under the GPL, version 2 or later.
+License: GPL-2+
 
 Files: inst/mvnrnd.m
 Copyright: © 2003 Iain Murray
-License: GPL-2
- This file is under the GPL, version 2 or later.
+License: GPL-2+
 
 Files: inst/jsupdf.m, inst/jsucdf.m
 Copyright: © 2006 Frederick A Niles
-License: GPL-3
- These *.m files are under the GPL, version 3 or later.
+License: GPL-3+
 
 Files: inst/betastat.m, inst/binostat.m, inst/chi2stat.m,
  inst/expstat.m, inst/fstat.m, inst/gamstat.m, inst/geostat.m
@@ -48,31 +41,31 @@ Files: inst/betastat.m, inst/binostat.m, inst/chi2stat.m,
  inst/raylrnd.m, inst/raylstat.m, inst/tstat.m, inst/unidstat.m,
  inst/unifstat.m, inst/wblstat.m
 Copyright: © 2006, 2007  Arno Onken
-License: GPL-3
- These *.m files are under the GPL, version 3 or later.
+License: GPL-3+
 
 Files: inst/nanvar.m
 Copyright: © 2008 Sylvain Pelissier
-License: GPL-3
- This file is under the GPL, version 3 or later.
+License: GPL-3+
 
 Files: inst/boxplot.m
 Copyright: © 2006 Alberto Pose
            © 2002 Alberto Terruzzi
-License: GPL-2
- This file is under the GPL, version 2 or later.
+License: GPL-2+
 
 Files: inst/histfit.m, inst/tabulate.m
 Copyright: © 2003 Alberto Terruzzi
-License: GPL-2
- This file is under the GPL, version 2 or later.
+License: GPL-2+
 
 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-statistics