[Pkg-octave-commit] [SCM] octave-optim branch, master, updated. 5840e4b496fdc1074dd8d9612718b46defbb2af2

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index a56a887..f9ef448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,10 @@ octave-optim (1.0.5-1) UNRELEASED; urgency=low
     + (Standards-Version): Bump to 3.8.1 (add file debian/README.source)
     + (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
   * debian/patches/pdfsources.diff: Add description
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:51:27 +0200
diff --git a/debian/copyright b/debian/copyright
index 22e7c0e..39f195f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,82 +6,66 @@ Upstream-Source: http://octave.sourceforge.net/optim/index.html
 Files: inst/leasqr.m
 Copyright: © 1992-1994 Richard Shrager, Arthur Jutan, Ray Muzic
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/LinearRegression.m,
 Copyright: © 2007 Andreas Stahel
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/expfit.m,
 Copyright: © 2000 Gert Van den Eynde
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/fminsearch.m,
 Copyright: © 2006 Sylvain Pelissier
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/mdsmax.m, inst/nmsmax.m, inst/adsmax.m,
 Copyright: © 2002 N.J.Higham
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/fzero.m,
 Copyright: © 2004 Lukasz Bodzon
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/fmin.m,
 Copyright: © 2001 Paul Kienzle
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/fmins.m
 Copyright: © 2003 Andy Adler
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/nrm.m, inst/line_min.m, inst/fminbnd.m, inst/deriv.m
 Copyright: © 2000 Ben Sapp
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/leasqrdemo.m,
 Copyright: © 1992-1994 Arthur Jutan
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/dfdp.m, inst/leasqrdemo.m
 Copyright: © 1992-1994 Ray Muzic
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/leasqrdemo.m
 Copyright: © 1992-1994 Richard Shrager
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/dfdp.m
 Copyright: © 1992-1994 Richard Shrager
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/dfdp.m
 Copyright: © 1992-1994 Arthur Jutan
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/rosenbrock.m, inst/battery.m, inst/samin_example.m
 Copyright: © 2004 Michael Creel
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/bfgsmin_example.m
 Copyright: © 2004,2005,2006   Michael Creel
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: src/numgradient.cc, src/numhessian.cc, src/samin.cc
 Copyright: © 2004, 2006 Michael Creel
@@ -91,12 +75,10 @@ License: GPL-2+
 Files: inst/bfgsmin.m
 Copyright: © 2006 Michael Creel
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: src/__bfgsmin.cc
 Copyright: © 2004, 2005, 2006, 2007 Michael Creel
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/cdiff.m, inst/test_min_4.m, inst/poly_2_ex.m,
  inst/fminunc.m, inst/d2_min.m, inst/test_d2_min_2.m,
@@ -135,12 +117,18 @@ 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'.  The complete text of the GNU Free
-Documentation License can be found in the file
-`/usr/share/common-licenses/GFDL'.
+
+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'.
+
+License: GFDL-1.2
+ On Debian systems, the complete text of the GNU Free Documentation
+ License, version 1.2, can be found in the file
+ `/usr/share/common-licenses/GFDL-1.2'.

-- 
octave-optim