[Pkg-octave-commit] [SCM] octave-ftp branch, master, updated. 3295b3c2217d922e814a619991df125232d8085a

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index cef3c0d..a253ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 octave-ftp (1.0.2-3) UNRELEASED; urgency=low
 
-  * 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, 17 May 2009 22:44:11 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 168ccc3..f8c21fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,12 +6,16 @@ Upstream-Source: http://octave.sourceforge.net/ftp/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/*
 Copyright © 2008 Xavier Delacour <xavier.delacour at gmail.com>
 License: BSD
 
-The complete text of the GNU General Public License, version 3, can be
-found in the file /usr/share/common-licenses/GPL-3. The complete text
-of the BSD license can be found in /usr/share/common-licenses/BSD.
+License: GPL-3+
+ 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: BSD
+ On Debian systems, the complete text of the BSD License, version 3,
+ can be found in the file `/usr/share/common-licenses/BSD'.

-- 
octave-ftp