[Pkg-octave-commit] [SCM] octave-control branch, master, updated. 4da7fc257cf1b551237de4071049c32a93841258

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 74a4743..86736a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ octave-control (1.0.10-1) UNRELEASED; urgency=low
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
   * debian/source.lintian-overrides: Add file for overriding Lintian
     warnings build-depends-without-arch-dep
-  * 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:49:57 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 86cd493..b73409c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,19 +6,21 @@ Upstream-Source: http://octave.sourceforge.net/control/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/feedback.m
 Copyright: © 2000 Ben Sapp <bsapp at lanl.gov>
 License: GPL-2+
- feedback.m is under the GPL, version 2 or later.
 
 Files: inst/unitfeedback.m
 Copyright: © 2007 ZYED ben Mohamed EL HIDRI <zyedm79 at yahoo.com>
 License: GPL-2+
- unitfeedback.m is under the GPL, version 2 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-control