[Pkg-octave-commit] [SCM] octave-io branch, master, updated. 2a0b0a6f2e8fab58bbb36072d5a8a427f023df8c

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 22e06ac..428e668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ octave-io (1.0.8-1) UNRELEASED; urgency=low
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
     + (Build-Depends): Drop quilt
-  * debian/copyright: Use DEP5 URL in Format-Specification
+  * debian/copyright:
+    + Use DEP5 URL in Format-Specification
+    + Use separate License stanzas for instructing about the location of
+      the different licenses used in the package
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:51:28 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 8da602e..ba9e14b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,22 +6,18 @@ Upstream-Source: http://octave.sourceforge.net/io/index.html
 Files: inst/csvwrite.m, inst/csvread.m
 Copyright: © 2001, 2008 Paul Kienzle
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/xlsread.m
 Copyright: © 2004 Alois Schloegl
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/append_save.m
 Copyright: © 2003 Tomer Altman
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: src/dlmread.cc
 Copyright: © 2008 Jonathan Stickel
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: src/textread.cc
 Copyright: © 2005 Stefan van der Walt
@@ -41,9 +37,13 @@ License: other
 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-io