[Pkg-octave-commit] [SCM] Debian packaging for octave-optim branch, master, updated. debian/1.0.17-2-8-gf0f62dc

Sun May 27 21:20:26 UTC 2012

The following commit has been merged in the master branch:
commit 3b7bd57c3c933695938182795231e0b9678c94c0
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun May 27 14:26:05 2012 +0200

    debian/copyright: reflect upstream changes

diff --git a/debian/copyright b/debian/copyright
index 6fdf102..47cb61f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,60 +3,34 @@ Upstream-Name: Optim package for Octave
 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/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
+Files: *
+Copyright: 2002-2008 Etienne Grossmann <etienne at egdn.net>
+           2010-2012 Olaf Till <olaf.till at uni-jena.de>
+           2004, 2006-2007, 2010 Michael Creel <michael.creel at uab.es>
+           2009 Levente Torok <TorokLev at gmail.com>
+           2002 N.J.Higham
+           2003 Andy Adler <adler at ncf.ca>
+           1992-1994 Arthur Jutan <jutan at charon.engga.uwo.ca>
+           1992-1994 Ray Muzic <rfm2 at ds2.uh.cwru.edu>
            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+
+           2007 Andreas Stahel <Andreas.Stahel at bfh.ch>
+           2000 Ben Sapp <bsapp at lanl.gov>
+           2011 Nir Krakauer <nkrakauer at ccny.cuny.edu>
+           2001-2002, 2007 Paul Kienzle <pkienzle at gmail.com>
+           2011 Carnë Draug <carandraug+dev at gmail.com>
+           2011 Joaquín Ignacio Aramendía <samsagax at gmail.com>
+           1996-1997 R. Storn
+           2009-2010 Christian Fischer <cfischer at itm.uni-stuttgart.de>
+           2011 Fernando Damian Nieuwveldt <fdnieuwveldt at gmail.com>
+           2011 Fotios Kasolis <fotios.kasolis at gmail.com>
+           2000 Gert Van den Eynde <na.gvandeneynde at na-net.ornl.gov>
+           2002 Rolf Fabian <fabian at tu-cottbus.de>
+           1994-2011 John W. Eaton <jwe at octave.org>
+           2009 Luca Favatella <slackydeb at gmail.com>
+           2009 Thomas Treichl <thomas.treichl at gmx.net>
+           2008-2009 VZLU Prague, a.s
+           2006 Sylvain Pelissier <sylvain.pelissier at gmail.com>
+License: GPL-3+
 
 Files: inst/polyfitinf.m
 Copyright: 1998-2011 Andrew V. Knyazev <andrew.knyazev at ucdenver.edu>
@@ -83,61 +57,13 @@ License: BSD-3-clause
  (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/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/linprog.m
-Copyright: 2009 Luca Favatella <slackydeb at gmail.com>
-License: GPL-2+
-
-Files: inst/fmin.m
-Copyright: 2001 Paul Kienzle
-License: GPL-2+
-
-Files: inst/fminsearch.m
-Copyright: 2006 Sylvain Pelissier <sylvain.pelissier at gmail.com>
-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/jacobs.m
-Copyright: 2011 Fotios Kasolis <fotios.kasolis at gmail.com>
-License: GPL-3+
-
-Files: inst/private/__null_optim__.m
-Copyright: 1994-2011 John W. Eaton
-License: GPL-3+
-
-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: inst/vfzero.m
-Copyright: 2008-2009 VZLU Prague, a.s
-License: GPL-3+
-
-Files: inst/expfit.m
-Copyright: 2000 Gert Van den Eynde
-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: doc/optim-mini-howto-2.lyx
-Copyright: Etienne Grossmann
+Copyright: Etienne Grossmann <etienne at egdn.net>
 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
@@ -155,24 +81,6 @@ Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
            2011-2012 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

-- 
Debian packaging for octave-optim

