[Pkg-octave-commit] [SCM] octave-ad branch, master, updated. 2c191cc6006d54f052d2a8910ca628b26aac87e6

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 696461b..85a0fb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ octave-ad (1.0.5-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>  Fri, 15 May 2009 18:51:22 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 753146a..546b973 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Upstream-Source: http://octave.sourceforge.net/ad/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: doc/ad.texi (in debian.patches/documentation-source.diff)
 Copyright: @ 2006, 2007 Thomas Kasper <thomaskasper@@gmx.net>
@@ -26,13 +25,18 @@ License: other
 
 Files: inst/*
 Copyright: (C) 2006, 2007 Thomas Kasper, <thomaskasper at gmx.net>
-License: GPL2+
+License: GPL-2+
 
 Files: src/*
 Copyright: (C) 2006, 2007 Thomas Kasper, <thomaskasper at gmx.net>
-License: GPL2+
+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.
\ No newline at end of file
+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-ad