[Pkg-octave-commit] [SCM] octave-benchmark branch, master, updated. bedda4be223aa66b86bdd3236631e79a74ab94af

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index df153ab..3c1a294 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,19 +6,21 @@ Upstream-Source: http://octave.sourceforge.net/benchmark/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/benchmark_index.m, inst/benchmark_permute.m
 Copyright: © 2009 VZLU Prague
-License: GPL2+
+License: GPL-2+
 
 Files: *
 Copyright: © 2008 Jaroslav Hajek <highegg at gmail.com>
-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-benchmark