[Pkg-octave-commit] [SCM] octave-bioinfo branch, master, updated. 810f1d7aa3ebfd3de111834c59e4720d414f8302

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index f3647f6..2b99f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,10 @@ octave-bioinfo (0.1.2-1) UNRELEASED; urgency=low
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
   * debian/source.lintian-overrides: Override Lintian warnings
     build-depends-without-arch-dep regarding debhelper and octave-pkg-dev
-  * 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:50:54 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 102e40c..e8164be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,13 +6,18 @@ Upstream-Source: http://octave.sourceforge.net/bioinfo/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/*
 Copyright: © (C) 2008 Bill Denney <bill at denney.ws>
 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-bioinfo