[Pkg-octave-commit] [SCM] octave-java branch, master, updated. 27f66c797cbf50c2c76b76750cba5d6f61252b02

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index 33fcbff..043ae10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,18 +6,17 @@ Upstream-Source: http://octave.sourceforge.net/java/index.html
 Files: debian/*
 Copyright: © 2008 Olafur Jens Sigurdsson <ojsbug at gmail.com>
 License: GPL-3+
- The Debian packaging information is under the GPL, version 3 or later.
 
-Files: inst/*
+Files: inst/*, src/*
 Copyright: © 2007 Michael Goffioul
 License: GPL-2+
- The *.m files are under the GPL, version 2 or later.
 
-Files: src/*
-Copyright: © 2007 Michael Goffioul
 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'.
 
-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-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-java