[Pkg-octave-commit] [SCM] octave-combinatorics branch, master, updated. 219281430deeb7a2290b5f3561377c995a62ef9d

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index dd9e4f1..316ec83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ octave-combinatorics (1.0.8-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:33 +0200
 
diff --git a/debian/copyright b/debian/copyright
index f432307..67b4514 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Upstream-Source: http://octave.sourceforge.net/combinatorics/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/combs.m
 Copyright: © 2007 Muthiah Annamalai <muthiah.annamalai at uta.edu>
@@ -16,8 +15,12 @@ Files: src/*
 Copyright: © 2006 Torsten Finke <fi at igh-essen.com>
 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. 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-combinatorics