[Pkg-octave-commit] [SCM] Debian packaging for octave-general branch, master, updated. debian/1.2.2-3-9-g31d55bb

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 2e6d5c84ea2684266bce2161e02216c4e4a22fcd
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri Mar 30 20:47:38 2012 +0200

    debian/copyright: Adjust for the new upstream version

diff --git a/debian/copyright b/debian/copyright
index 817199c..607b63b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,34 +3,58 @@ Upstream-Name: General package for Octave
 Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
 Source: http://octave.sourceforge.net/general/
 
-Files: inst/@dict/dict.m inst/@dict/display.m inst/@dict/end.m
- inst/@dict/get.m inst/@dict/has.m inst/@dict/isempty.m inst/@dict/join.m
- inst/@dict/length.m inst/@dict/private/__lookup_compat__.m
- inst/@dict/struct.m inst/@dict/subsasgn.m inst/@dict/subsref.m
- inst/adresamp2.m inst/parcellfun.m inst/private/parcellfun_opts.m
- inst/unresamp2.m src/fload.cc src/fsave.cc
+Files: inst/@dict/*.m inst/adresamp2.m inst/parcellfun.m
+ inst/private/parcellfun_opts.m inst/safeprod.m inst/unresamp2.m
+ src/fload.cc src/fsave.cc src/packfields.cc src/unpackfields.cc
 Copyright: 2009-2010 VZLU Prague, a.s., Czech Republic
 License: GPL-3+
 
-Files: src/packfields.cc src/unpackfields.cc
-Copyright: 2009 VZLU Prague
+Files: inst/@inputParser/*.m
+Copyright: 2011-2012 Carnë Draug <carandraug+dev at gmail.com>
 License: GPL-3+
 
+Files: inst/majle.m
+Copyright: 2010 Andrew V. Knyazev <andrew.knyazev at ucdenver.edu>
+           2010, Merico E. Argentati <Merico.Argentati at ucdenver.edu>
+License: BSD-3
+ 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.
+     3 Neither the name of the author 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 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.
+
 Files: inst/unvech.m
 Copyright: 2006 Michael Creel <michael.creel at uab.es>
            2009 Jaroslav Hajek
-License: GPL-2+
-
-Files: inst/safeprod.m
-Copyright: 2008 VZLU Prague, a.s., Czech Republic
-License: GPL-2+
+           2011 Carnë Draug <carandraug+dev at gmail.com>
+           2011 Juan Pablo Carbajal <carbajal at ifi.uzh.ch>
+License: GPL-3+
 
 Files: inst/ztvals.m
 Copyright: 2009 Jaroslav Hajek
 License: GPL-3+
 
 Files: inst/pararrayfun.m
-Copyright: 2009 Jaroslav Hajek
+Copyright: 2009 Jaroslav Hajek <highegg at gmail.com>
+           2009 Travis Collier <travcollier at gmail.com>
            2009 VZLU Prague, a.s., Czech Republic
 License: GPL-3+
 
@@ -45,7 +69,11 @@ License: GPL-3+
 
 Files: src/mark_for_deletion.cc
 Copyright: 2002 Andy Adler
-License: GPL-2+
+License: GPL-3+
+
+Files: src/__exit__.cc
+Copyright: 2008, Olaf Till <olaf.till at uni-jena.de>
+License: GPL-3+
 
 Files: src/SHA1.cc
 Copyright: 1999 Andy Adler
@@ -59,24 +87,6 @@ Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
            2009, 2012 Rafael Laboissiere <rafael at laboissiere.net>
 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,
- 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-general