[Pkg-octave-commit] [SCM] Debian packaging for octave-linear-algebra branch, master, updated. debian/2.1.0-2-10-g63b5572

Mon May 21 21:44:54 UTC 2012

The following commit has been merged in the master branch:
commit 31df5c4b2a49c0bedc4ad638eabaa898e10f3efd
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon May 21 21:12:24 2012 +0200

    debian/copyright: reflect upstream changes

diff --git a/debian/copyright b/debian/copyright
index b6e6684..88ac54a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,59 +3,60 @@ Upstream-Name: Linear-Algebra package for Octave
 Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
 Source: http://octave.sourceforge.net/linear-algebra/
 
-Files: inst/@kronprod/*
+Files: *
 Copyright: 2010 Soren Hauberg
-License: GPL-3+
-
-Files: inst/@kronprod/size_equal.m inst/@blksparse/* inst/ndcovlt.m
-       inst/cod.m inst/smwsolve.m
-Copyright: 2009-2010 VZLU Prague
-License: GPL-3+
-
-Files: src/dbleGSVD.h src/dbleGSVD.cc src/CmplxGSVD.cc src/CmplxGSVD.h
-       src/gsvd.cc
-Copyright: 1996, 1997 John W. Eaton
-           2006, 2010 Pascal Dupuis <Pascal.Dupuis at uclouvain.be>
-License: GPL-2+
-
-Files: src/pgmres.cc
-Copyright: 2009 Carlo de Falco
-License: GPL-2+
-
-Files: inst/condeig.m
-Copyright: 2006, 2007 Arno Onken <asnelt at asnelt.org>
-License: GPL-3+
-
-Files: inst/cartprod.m
-Copyright: 2008 Muthiah Annamalai <muthiah.annamalai at uta.edu>
-           2010 VZLU Prague
-License: GPL-3+
-
-Files: inst/rotv.m inst/rotparams.m
-Copyright: 2002 Etienne Grossmann <etienne at cs.uky.edu>
-License: GPL-2+
-
-Files: inst/thfm.m
-Copyright: 2001 Paul Kienzle <pkienzle at users.sf.net>
+           2009-2010 VZLU Prague
+           2006, 2007 Arno Onken <asnelt at asnelt.org>
+           2008 Muthiah Annamalai <muthiah.annamalai at uta.edu>
+           2001 Paul Kienzle <pkienzle at users.sf.net>
            2001 Rolf Fabian <fabian at tu-cottbus.de>
            2011 Philip Nienhuis <pr.nienhuis at hccnet.nl>
+           2000, 2011 P.R. Nienhuis <prnienhuis at users.sf.net>
            2011 Carnë Draug <carandraug+dev at gmail.com>
+           2012 Nir Krakauer <nkrakauer at ccny.cuny.edu>
+           2012 Jingu Kim and Haesun Park <jingu at cc.gatech.edu>
+           2002 Etienne Grossmann <etienne at egdn.net>
+           1996, 1997 John W. Eaton
+           2006, 2010 Pascal Dupuis <Pascal.Dupuis at uclouvain.be>
+           2009 Carlo de Falco <cdf at users.sourceforge.net>
 License: GPL-3+
 
-Files: inst/funm.m
-Copyright: 2001 Paul Kienzle <pkienzle at users.sf.net>
-           2000, 2011 P.R. Nienhuis <prnienhuis at users.sf.net>
-License: GPL-2+
-
 Files: inst/lobpcg.m
 Copyright: 2000-2011 A.V. Knyazev <Andrew.Knyazev at ucdenver.edu>
-License: LGPL-2.1+
+License: LGPL-3+
+
+Files: inst/nmf_pg.m
+Copyright: 2005-2006 Chih-Jen Lin <cjlin at csie.ntu.edu.tw>
+License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
-           2011 Sébastien Villemot <sebastien.villemot at ens.fr>
+           2008-2009 Rafael Laboissiere <rafael at laboissiere.net>
+           2008-2011 Thomas Weber <tweber at debian.org>
+           2011-2012 Sébastien Villemot <sebastien.villemot at ens.fr>
 License: GPL-3+
 
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+     1 Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     2 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.
+ .
+ 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 THE AUTHOR OR CONTRIBUTORS 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.
+
 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
@@ -74,39 +75,21 @@ License: GPL-3+
  License, version 3, can be found in the file
  `/usr/share/common-licenses/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: LGPL-2.1+
+License: LGPL-3+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 3 of the License, or (at your option) any later version.
  .
  This library 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
  Lesser General Public License for more details.
  .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
- License, version 2.1, can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
+ License, version 3, can be found in the file
+ `/usr/share/common-licenses/LGPL-3'.
+

-- 
Debian packaging for octave-linear-algebra

