[Pkg-octave-commit] [SCM] octave-fixed branch, master, updated. 55f25b8dc8726b2ac0275e360f0b6ca314aa2551

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index ea4e041..584e5bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ octave-fixed (0.7.9-1) UNRELEASED; urgency=low
     + (Standards-Version): Bump to 3.8.1 (add file debian/README.source)
     + (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:24 +0200
 
diff --git a/debian/copyright b/debian/copyright
index bff10b8..6fab9c6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,52 +6,44 @@ Upstream-Source: http://octave.sourceforge.net/fixed/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: examples/ffft.cc
 Copyright: © 2003 Motorola Inc
  © 2003 Laurent Mazet
  © 2003 David Bateman
 License: GPL-2+
- The files under examples/ are under the GPL, version 2 or later.
 
 Files: examples/ffft.h
 Copyright: © 2001-2003 Motorola Inc
  © 2001-2003 Laurent Mazet
  © 2003 David Bateman
 License: GPL-2+
- The files under examples/ are under the GPL, version 2 or later.
 
 Files: examples/fixed_inc.cc
 Copyright: © 2003 Motorola Inc
  © 2003 David Bateman
 License: GPL-2+
- The files under examples/ are under the GPL, version 2 or later.
 
 Files: examples/*.m
 Copyright: © 2003 Motorola Inc
  © 2003 David Bateman
 License: GPL-2+
- The files under examples/ are under the GPL, version 2 or later.
 
 Files: inst/*.m
 Copyright: © 2003 Motorola Inc
  © 2003 David Bateman
 License: GPL-2+
- The .m files under inst/ are under the GPL, version 2 or later.
 
 Files: src/int/*
 Copyright: © 2001-2003 Motorola Inc
  © 2001-2003 Laurent Mazet
  © 2003 David Bateman
 License: GPL-2+
- The files under src/int/ are under the GPL, version 2 or later.
 
 Files: src/*
 Copyright: © 2003-2004 Motorola Inc
  © 2003-2004 David Bateman
 License: GPL-2+
- The files under src/ are under the GPL, version 2 or later.
 
 Files: doc/*
 Copyright: © 2003-2004 Motorola Inc
@@ -70,9 +62,13 @@ License: other
  into another language, under the same conditions as for modified
  versions.
 
+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'.
 
-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'.
 

-- 
octave-fixed