[Pkg-octave-commit] [SCM] octave-strings branch, master, updated. b50f68c1b7e86c2a1b7e898510f9decd9edfc1c2

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 43895e7..49801cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ octave-strings (1.0.7-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:34 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c8ee523..a7a1ee6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,12 +6,10 @@ Upstream-Source: http://octave.sourceforge.net/strings/index.html
 Files: inst/cstrcmp.m, inst/strjoin.m, inst/base64decode.m
 Copyright: © 2007 Muthiah Annamalai
 License: GPL-2+
- These *.m files are under the GPL, version 2 or later.
 
 Files: inst/editdistance.m
 Copyright: © 2006 Muthiah Annamalai
 License: GPL-2+
- This *.m files is under the GPL, version 2 or later.
 
 Files: ./src/pcregexp.cc
 Copyright: © 2004 Stefan van der Walt
@@ -46,9 +44,14 @@ License: PD
 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-strings