[Pkg-octave-commit] [SCM] octave-audio branch, master, updated. ba8b88d32001f09fa1efbe87f9e560e67a7522ca

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index a6b84db..f43dd4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ octave-audio (1.1.3-1) UNRELEASED; urgency=low
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
     + (Build-Depends): Add quilt
   * debian/rules: Include patchsys-quilt.mk
-  * 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:46:49 +0200
 
diff --git a/debian/copyright b/debian/copyright
index e28d691..d3ec606 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,12 +6,10 @@ Upstream-Source: http://octave.sourceforge.net/audio/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/*.m
 Copyright: © 1999, 2000 Paul Kienzle <pkienzle at users.sf.net>
 License: GPL-2+
- The *.m files are under the GPL, version 2 or later.
 
 Files: src/OFSndPlay.cc
 Copyright: © 2000 Per Persson <persquare at users.sf.net>
@@ -31,8 +29,13 @@ License: other
  Paul Kienzle is not responsible for the consequences of using
  this software.
 
-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-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: 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.
 

-- 
octave-audio