[Pkg-octave-commit] [SCM] Debian packaging for octave-optim branch, master, updated. e4d1295d48c3bb26ae5eede43722db3bf18df969

Sébastien Villemot sebastien.villemot at ens.fr
Fri Dec 2 22:40:40 UTC 2011


The following commit has been merged in the master branch:
commit 8c8696e0bfabf15462ec14862e176201cf835370
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Thu Dec 1 21:45:27 2011 +0100

    debian/copyright: reflect upstream changes, update to latest DEP5

diff --git a/debian/copyright b/debian/copyright
index 39f195f..79cffcc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,134 +1,190 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=48
+Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: Optim package for Octave
-Upstream-Maintainer: The Octave Community <octave-dev at lists.sf.net>
-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+
-
-Files: inst/LinearRegression.m,
-Copyright: © 2007 Andreas Stahel
-License: GPL-2+
-
-Files: inst/expfit.m,
-Copyright: © 2000 Gert Van den Eynde
-License: GPL-2+
-
-Files: inst/fminsearch.m,
-Copyright: © 2006 Sylvain Pelissier
-License: GPL-2+
-
-Files: inst/mdsmax.m, inst/nmsmax.m, inst/adsmax.m,
-Copyright: © 2002 N.J.Higham
-License: GPL-2+
+Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
+Source: http://octave.sourceforge.net/optim/
+
+Files: inst/cdiff.m inst/d2_min.m inst/fminunc_compat.m inst/minimize.m
+ inst/nelder_mead_min.m inst/optimset_compat.m inst/poly_2_ex.m
+ inst/test_d2_min_1.m inst/test_d2_min_2.m inst/test_d2_min_3.m
+ inst/test_fminunc_1.m inst/test_min_1.m inst/test_min_2.m inst/test_min_3.m
+ inst/test_min_4.m inst/test_minimize_1.m inst/test_nelder_mead_min_1.m
+ inst/test_nelder_mead_min_2.m
+Copyright: 2002-2008 Etienne Grossmann
+License: GPL-2+
+
+Files: inst/curvefit_stat.m
+ inst/nonlin_curvefit.m inst/nonlin_residmin.m
+ inst/private/__collect_constraints__.m inst/private/__covd_wls__.m
+ inst/private/__covp_corp_wls__.m inst/private/__nonlin_residmin__.m
+ inst/private/__plot_cmds__.m inst/private/__residmin_stat__.m
+ inst/residmin_stat.m inst/wrap_f_dfdp.m src/__disna_optim__.cc
+Copyright: 2010-2011 Olaf Till <olaf.till at uni-jena.de>
+License: GPL-3+
 
-Files: inst/fzero.m,
-Copyright: © 2004 Lukasz Bodzon
-License: GPL-2+
+Files: inst/battery.m inst/bfgsmin.m inst/bfgsmin_example.m inst/rosenbrock.m
+ inst/samin_example.m src/__bfgsmin.cc src/numgradient.cc src/numhessian.cc
+ src/samin.cc
+Copyright: 2004-2007,2010 Michael Creel <michael.creel at uab.es>
+License: GPL-2+
+
+Files: inst/__poly_2_extrema.m inst/brent_line_min.m inst/__bracket_min.m
+ inst/__semi_bracket.m inst/cg_min.m
+Copyright: *No copyright*
+License: GPL-2+
+
+Files: inst/polyconf.m inst/test_wpolyfit.m inst/wpolyfit.m inst/wsolve.m
+Copyright: public-domain
+License: public-domain
+ This program is granted to the public domain.
+
+Files: inst/dfdp.m inst/leasqr.m inst/private/__dfdp__.m
+ inst/private/__lm_svd__.m
+Copyright: 1992-1994 Arthur Jutan
+           1992-1994 Ray Muzic
+           1992-1994 Richard Shrager
+           2010-2011 Olaf Till <olaf.till at uni-jena.de>
+License: GPL-2+
+
+Files: inst/dcdp.m inst/dfpdp.m inst/dfxpdp.m inst/cpiv_bard.m inst/gjp.m
+Copyright: 2010-2011 Olaf Till <olaf.till at uni-jena.de>
+License: GPL-2+
+
+Files: inst/adsmax.m inst/mdsmax.m inst/nmsmax.m
+Copyright: 2002 N.J.Higham
+License: GPL-2+
+
+Files: inst/line_min.m
+       inst/nrm.m
+Copyright: 2000 Ben Sapp.
+License: GPL-2+
+
+Files: inst/polyfitinf.m
+Copyright: 1998-2011 Andrew V. Knyazev <andrew.knyazev at ucdenver.edu>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of the <organization> nor the
+       names of its contributors may be used to endorse or promote products
+       derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: inst/deriv.m
+Copyright: 2000 Ben Sapp <bsapp at nua.lampf.lanl.gov>
+           2011 Carnë Draug <carandraug+dev at gmail.com>
+           2011 Joaquín Ignacio Aramendía <samsagax at gmail.com>
+License: GPL-3+
 
-Files: inst/fmin.m,
-Copyright: © 2001 Paul Kienzle
+Files: inst/LinearRegression.m
+Copyright: 2007 Andreas Stahel <Andreas.Stahel at bfh.ch>
 License: GPL-2+
 
 Files: inst/fmins.m
-Copyright: © 2003 Andy Adler
-License: GPL-2+
-
-Files: inst/nrm.m, inst/line_min.m, inst/fminbnd.m, inst/deriv.m
-Copyright: © 2000 Ben Sapp
-License: GPL-2+
-
-Files: inst/leasqrdemo.m,
-Copyright: © 1992-1994 Arthur Jutan
-License: GPL-2+
-
-Files: inst/dfdp.m, inst/leasqrdemo.m
-Copyright: © 1992-1994 Ray Muzic
+Copyright: 2003 Andy Adler
 License: GPL-2+
 
-Files: inst/leasqrdemo.m
-Copyright: © 1992-1994 Richard Shrager
+Files: inst/linprog.m
+Copyright: 2009 Luca Favatella <slackydeb at gmail.com>
 License: GPL-2+
 
-Files: inst/dfdp.m
-Copyright: © 1992-1994 Richard Shrager
+Files: inst/fmin.m
+Copyright: 2001 Paul Kienzle
 License: GPL-2+
 
-Files: inst/dfdp.m
-Copyright: © 1992-1994 Arthur Jutan
+Files: inst/fminsearch.m
+Copyright: 2006 Sylvain Pelissier <sylvain.pelissier at gmail.com>
 License: GPL-2+
 
-Files: inst/rosenbrock.m, inst/battery.m, inst/samin_example.m
-Copyright: © 2004 Michael Creel
-License: GPL-2+
+Files: inst/de_min.m
+Copyright: 1996-1997 R. Storn
+           2009-2010 Christian Fischer <cfischer at itm.uni-stuttgart.de>
+License: GPL-3+
 
-Files: inst/bfgsmin_example.m
-Copyright: © 2004,2005,2006   Michael Creel
-License: GPL-2+
+Files: inst/jacobs.m
+Copyright: 2011 Fotios Kasolis <fotios.kasolis at gmail.com>
+License: GPL-3+
 
-Files: src/numgradient.cc, src/numhessian.cc, src/samin.cc
-Copyright: © 2004, 2006 Michael Creel
-License: GPL-2+
- These files are under the GPL, version 2 or later.
+Files: inst/private/__null_optim__.m
+Copyright: 1994-2011 John W. Eaton
+License: GPL-3+
 
-Files: inst/bfgsmin.m
-Copyright: © 2006 Michael Creel
-License: GPL-2+
+Files: inst/optim_problems.m
+Copyright: 2007 Paul Kienzle (sort-based lookup in ODE solver)
+           2009 Thomas Treichl <treichl at users.sourceforge.net>
+           2010 Olaf Till <olaf.till at uni-jena.de>
+License: GPL-3+
 
-Files: src/__bfgsmin.cc
-Copyright: © 2004, 2005, 2006, 2007 Michael Creel
-License: GPL-2+
+Files: inst/vfzero.m
+Copyright: 2008-2009 VZLU Prague, a.s
+License: GPL-3+
 
-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,
- inst/test_fminunc_1.m, inst/test_min_1.m, inst/minimize.m,
- inst/test_min_2.m, inst/optimset.m, inst/test_d2_min_3.m,
- inst/test_d2_min_1.m, inst/test_nelder_mead_min_1.m,
- inst/nelder_mead_min.m, inst/test_minimize_1.m, inst/test_min_3.m,
- inst/test_nelder_mead_min_2.m, src/leval.cc
-Copyright: © 2002 Etienne Grossmann
+Files: inst/expfit.m
+Copyright: 2000 Gert Van den Eynde
 License: GPL-2+
- These files are under the GPL, version 2 or later.
-
-Files: inst/expdemo.m, inst/polyconf.m, inst/test_wpolyfit.m,
- inst/wpolyfitdemo.m, inst/wpolyfit.m
-Copyright: © Paul Kienzle
-License: PD
- These programs are public domain.
 
 Files: doc/optim-mini-howto-2.lyx
-Copyright: © Etienne Grossmann
-License: GFDL-any
+Copyright: Etienne Grossmann
+License: GFDL-NIV
  This document is free documentation; you an redistribute it and/or
  modify it under the terms of the GNU Free Documentation License as
  published by the Free Software Foundation, with no version specified and
  no cover texts, invariant sections and whatever else.
-
-Files: doc/mintoolkit.lyx
-Copyright: © Michael Creel
-License: GFDL-any
- This document is free documentation; you an redistribute it and/or
- modify it under the terms of the GNU Free Documentation License as
- published by the Free Software Foundation, with no version specified and
- no cover texts, invariant sections and whatever else. (This information was
- given to us personally by the author.)
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License, version 1.3, can be found in the file
+ `/usr/share/common-licenses/GFDL-1.3'.
 
 Files: debian/*
-Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+           2011 Sébastien Villemot <sebastien.villemot at ens.fr>
 License: GPL-3+
 
 License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; If not, see <http://www.gnu.org/licenses/>.
+ .
  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+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ .
  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'.

-- 
Debian packaging for octave-optim



More information about the Pkg-octave-commit mailing list