[Pkg-octave-commit] [SCM] octave-general branch, master, updated. 662b9b69af668c6ab43b5322b2ef591017058e4e

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 2117766..5af4d7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ octave-general (1.1.2-1) UNRELEASED; urgency=low
     + (Standards-Version): Bump to 3.8.1 (no changes needed)
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
-  * 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:37 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 0407da8..bfbbd29 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,22 +6,18 @@ Upstream-Source: http://octave.sourceforge.net/general/index.html
 Files: inst/*.m
 Copyright: © 2002 Etienne Grossmann
 License: GPL-2+
- The *.m files are under the GPL, version 2 or later.
 
 Files: inst/unvech.m
 Copyright: © 2006 Michael Creel
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/transpose.m, inst/ctranspose.m
 Copyright: © 2001 Laurent Mazet
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/issorted.m
 Copyright: © 2006 Sylvain Pelissier and Paul Kienzle
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: src/SHA1.cc
 Copyright: © 1999 Andy Adler
@@ -32,19 +28,22 @@ License: other
 Files: src/mark_for_deletion.cc
 Copyright: © 2002 Andy Adler
 License: GPL-other
- This files is under the GPL, no version specified.
 
 Files: src/deref.cc
 Copyright: © 2002 Paul Kienzle
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 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-general