[Pkg-octave-commit] [SCM] octave-database branch, master, updated. 43cb1d0745f68c7030f397e203fa64da04cb7048

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/copyright b/debian/copyright
index f46fb21..88e46da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Upstream-Source: http://octave.sourceforge.net/database/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: src/libpq-fe.h
 Copyright: Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
@@ -15,7 +14,7 @@ License: BSD
 
 Files: src/mysql_filtered.h
 Copyright: © (C) 2000-2003 MySQL AB
-License: GPL2
+License: GPL-2
 
 Files: src/mysql.i
        src/odbc.i
@@ -25,10 +24,16 @@ Files: src/mysql.i
 Copyright: © (c) 2008, Xavier Delacour <xavier.delacour at gmail.com>
 License: BSD
 
-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'.
 
-On Debian systems, the complete text of the BSD license, can be found
-in the file /usr/share/common-licenses/BSD.
+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'.
+
+License: BSD
+ On Debian systems, the complete text of the BSD license, can be found
+ in the file `/usr/share/common-licenses/BSD'.

-- 
octave-database