[Pkg-octave-commit] [SCM] Debian packaging for octave-miscellaneous branch, master, updated. debian/1.0.11-3-11-g280a6fa

Mon Apr 2 13:43:48 UTC 2012

The following commit has been merged in the master branch:
commit 95a5b286a133b3efe2a520dcbb06ec0edcdbdc89
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Apr 2 15:14:07 2012 +0200

    debian/copyright: reflect upstream changes

diff --git a/debian/copyright b/debian/copyright
index d3c868d..51102b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,86 +4,27 @@ Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
 Source: http://octave.sourceforge.net/miscellaneous/index.html
 
 Files: *
-Copyright: 2003 Tomer Altman
-           2004 Laurent Mazet
-           2005 Carl Osterwisch
+Copyright: 1999 Paul Kienzle <pkienzle at users.sf.net>
+           1999 Lucent Technologies
+           2002 Etienne Grossmann <etienne at isr.ist.utl.pt>
+           2002 Quentin Spencer <qspencer at ieee.org>
+           2003 Tomer Altman <taltman at lbl.gov>
+           2005 Carl Osterwisch <osterwischc at asme.org>
            2006 Fredrik Bulow <fredrik.bulow at gmail.com>
            2006 Hansgeorg Schwibbe
-           2002 Etienne Grossmann
            2007-2008 Muthiah Annamalai <muthiah.annamalai at uta.edu>
-           2008 Thomas Treichl <treichl at users.sourceforge.net>
-License: GPL-2+
-
-Files: src/cell2cell.cc src/partarray.cc
-Copyright: 2010-2011, Olaf Till
-License: GPL-3+
-
-Files: inst/hilbert_curve.m inst/peano_curve.m inst/z_curve.m
-Copyright: 2009 Javier Enciso <j4r.e4o at gmail.com>
-License: GPL-3+
-
-Files: inst/colorboard.m inst/gameoflife.m inst/nze.m
-Copyright: 2009-2010, VZLU Prague, a.s
-License: GPL-3+
-
-Files: inst/publish.m
-Copyright: 2010 Fotios Kasolis
-License: GPL-3+
-
-Files: inst/rolldices.m inst/solvesudoku.m
-Copyright: 2009 Jaroslav Hajek <highegg at gmail.com>
+           2008 Thomas Treichl <thomas.treichl at gmx.net>
+           2009 Javier Enciso <j4r.e4o at gmail.com>
+           2009-2010, VZLU Prague, a.s
+           2009 Jaroslav Hajek <highegg at gmail.com>
+           2010 Fotios Kasolis <fotios.kasolis at gmail.com>
+           2010-2011 Olaf Till <i7tiol at t-online.de>
+           2011 Thomas Weber <tweber at debian.org>
+           2011 Piotr Krzyzanowski <piotr.krzyzanowski at mimuw.edu.pl>
+           2012 Carnë Draug <carandraug+dev at gmail.com>
+           2012 Juan Pablo Carbajal <carbajal at ifi.uzh.ch>
 License: GPL-3+
 
-Files: src/waitbar.cc
-Copyright: 2002 Quentin Spencer <qspencer at ieee.org>
-License: LGPL-2+
-
-Files: src/stringmatch.c
-Copyright: 1987-1993 The Regents of the University of California.
-           1994-1998 Sun Microsystems, Inc.
-           2001 by Kevin B. Kenny
-License: other
- This software is copyrighted by the Regents of the University of
- California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
- Corporation and other parties.  The following terms apply to all files
- associated with the software unless explicitly disclaimed in
- individual files.
- .
- The authors hereby grant permission to use, copy, modify, distribute,
- and license this software and its documentation for any purpose, provided
- that existing copyright notices are retained in all copies and that this
- notice is included verbatim in any distributions. No written agreement,
- license, or royalty fee is required for any of the authorized uses.
- Modifications to this software may be copyrighted by their authors
- and need not follow the licensing terms described here, provided that
- the new terms are clearly indicated on the first page of each file where
- they apply.
-
-Files: src/xmltree_read.l
-Copyright: 1999 Kristoffer Rose
-License: other
- You can redistribute and/or modify this program provided the following
- two conditions hold:
- .
- 1. The program is distributed WITHOUT ANY WARRANTY from the author of
-    FleXML; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.
- .
- 2. The program distribution conditions do not in any way affect the
-    distribution conditions of the FleXML system used to generate this
-    file or any version of FleXML derived from that system.
- .
- Notice that these are explicit rights granted to you for files
- generated by the FleXML system.  For your rights in connection with
- the FleXML system itself please consult the GNU General Public License.
-
-Files: lauchli.m
-Copyright: public-domain
-License: public-domain
- This file is in the public domain.
-Comment: 
- File distributed through a patch in the Debian package.
-
 Files: debian/*
 Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
            2008-2012 Thomas Weber <tweber at debian.org>
@@ -91,24 +32,6 @@ Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
            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,
- 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
@@ -127,20 +50,3 @@ License: GPL-3+
  License, version 3, can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-License: LGPL-2+
- 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 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, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU Lesser General Public License
- version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'.
-

-- 
Debian packaging for octave-miscellaneous

