[Pkg-octave-commit] [SCM] octave-informationtheory branch, master, updated. 4d8cc2d5044f9952a9b8bb360df1d14f5cc1be83

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 9540bc7..9eba44a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ octave-informationtheory (0.1.7-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:51:40 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 24ef395..36a249d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,24 +11,28 @@ Files: inst/arithmetic_decode.m, inst/laverage.m, inst/unarydec.m,
  inst/tunstallcode.m, inst/narysource.m, inst/unaryenc.m
 Copyright: © 2006 Muthiah Annamalai
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/kullback_leibler_distance.m, inst/shannon_entropy.m,
  inst/hartley_entropy.m
 Copyright: © 2007 Muthiah Annamalai
+License: GPL-2+
 
 Files: inst/infoentr_seq.m, inst/infogain_seq.m, inst/condentr_seq.m,
  inst/mutualinfo_seq.m
 Copyright: © 2006 Joseph Wakeling
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: debian/*
 Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
 License: GPL-3+
- The Debian packaging information is under the GPL, version 3 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-informationtheory