[Pkg-octave-commit] [SCM] octave-vrml branch, master, updated. 01178c20d4d8154078294804f9ce33210b487b08

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 0542ca5..bd2ede1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ octave-vrml (1.0.9-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
   * debian/patches/whitedune_for_freewrl: Add description
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:49:43 +0200
diff --git a/debian/copyright b/debian/copyright
index a7dc278..11d5641 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Upstream-Source: http://octave.sourceforge.net/vrml/index.html
 Files: inst/*.m
 Copyright: © 2002 Etienne Grossmann
 License: GPL-2+
- The *.m files are under the GPL, version 2 or later.
 
 Files: doc/*
 Copyright: © Etienne Grossmann <etienne at isr.ist.utl.pt>
@@ -17,9 +16,13 @@ License: GFDL-any
 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-vrml