[Pkg-octave-commit] [SCM] octave-optiminterp branch, master, updated. 0dbfc43d8a4620830d92305f831574e5b8205299

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index 9cea865..c2960bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,25 +6,26 @@ Upstream-Source: http://octave.sourceforge.net/optiminterp/index.html
 Files: inst/optiminterp1.m, inst/optiminterp2.m, inst/optiminterp3.m
 Copyright: © 2006 Alexander Barth
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: src/optimal_interpolation.F90, src/optiminterp.cc,
  src/example_optiminterp.F90, src/optiminterp_wrapper.F90
 Copyright: © 2005 Alexander Barth
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/optiminterp4.m
 Copyright: © 2007 Aida Alvera-Azcárate
 License: GPL-2+
- This file is 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-optiminterp