[Pkg-octave-commit] [SCM] octave-triangular branch, master, updated. 1bcea25c0f5588f5b401dc56f96ba5a9e1fe6628

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index 3e448f7..dda8850 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,4 +6,17 @@ Upstream-Source: http://octave.sourceforge.net/triangular/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: *
+Copyright: © 2003 David Bateman
+License: GPL-2+
+
+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-triangular