[Pkg-octave-commit] [SCM] octave-plot branch, master, updated. 420c340cb0fcff892d1c1aa1eb96ff7665582696

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 420c340cb0fcff892d1c1aa1eb96ff7665582696
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Thu May 21 00:06:05 2009 +0200

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 2511aee..1d1e1a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ octave-plot (1.0.7-1) UNRELEASED; urgency=low
   * debian/copyright:
     + Use DEP5 URL in Format-Specification
     + Remove obsolete text
+    + Use separate License stanzas
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:51:01 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 29193b4..83816c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,17 +6,14 @@ Upstream-Source: http://octave.sourceforge.net/plot/index.html
 Files: inst/gget.m
 Copyright: © 1999 Daniel Heiserer
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/dxfwrite.m
 Copyright: © 2004 Patrick Labbe and Laurent Mazet
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/tricontour.m
 Copyright: © 2008 Andreas Stahel
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: src/graphics.cc, src/graphics.h, src/gzoom.cc
 Copyright: © 2000 Laurent Mazet
@@ -25,7 +22,7 @@ License: other
  copyright notice must be maintained.  Paul Kienzle is not responsible
  for the consequences of using this software.
 
-Files: , src/gtext.cc
+Files: src/gtext.cc
 Copyright: © 2000 Paul Kienzle
 License: other
  This program is free software and may be used for any purpose.  This
@@ -40,14 +37,18 @@ 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.
 
 Files: hist2d.m, tics.m
 Copyright: © Paul Kienzle
 License: PD
  This code is public domain.
+
+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-plot