[Pkg-octave-commit] [SCM] octave-miscellaneous branch, master, updated. c9058d4fc2f35f98adb960c0fc569c709cb09fa4

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index 9eb2ad6..ece8b38 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Upstream-Source: http://octave.sourceforge.net/miscellaneous/index.html
 Files: inst/map.m
 Copyright: © 2003 Tomer Altman
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/xmlwrite.m, src/xmlread.cc, src/csv2cell.cc,
  src/xmltree.c, src/csvconcat.cc, src/xmltree_read.h,
@@ -14,17 +13,14 @@ Files: inst/xmlwrite.m, src/xmlread.cc, src/csv2cell.cc,
  src/csvexplode.cc
 Copyright: © 2004 Laurent Mazet
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/units.m
 Copyright: © 2005   Carl Osterwisch
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/zigzag.m, inst/zagzig.m
 Copyright: © 2006 Fredrik Bulow
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: src/stringmatch.c
 Copyright: © 1987-1993 The Regents of the University of California.
@@ -50,12 +46,10 @@ License: other
 Files: src/waitbar.cc
 Copyright: © 2002  Quentin Spencer
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/csv2latex.m
 Copyright: © 2006 Hansgeorg Schwibbe
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: src/xmltree_read.l
 Copyright: © 1999 Kristoffer Rose
@@ -79,17 +73,14 @@ Files: inst/rotv.m, inst/rotparams.m, inst/temp_name.m,
  inst/slurp_file.m, inst/read_options.m
 Copyright: © 2002 Etienne Grossmann
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/reduce.m, inst/map.m, inst/match.m, inst/apply.m
 Copyright: © 2007, Muthiah Annamalai
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/infoskeleton.m
 Copyright: © 2008 Muthiah Annamalai
 License: GPL
- These files are under the GPL, no version specified.
 
 Files: lauchli.m (distributed through a patch in the Debian package) is
 Copyright: © Paul Kienzle
@@ -99,9 +90,13 @@ License: PD
 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: GPL2+
+ 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-miscellaneous