[Pkg-octave-commit] [SCM] Debian packaging for octave-specfun branch, master, updated. upstream/1.1.0-8-gd90f56b

Sat Mar 10 10:54:07 UTC 2012

The following commit has been merged in the master branch:
commit d90f56b837dbbf8fa4944ff7bbe46d7ec5f2789b
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat Mar 10 11:22:54 2012 +0100

    Update copyright notices and adapted to the 1.0 format

diff --git a/debian/changelog b/debian/changelog
index b5b9f4f..059af64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ octave-specfun (1.1.0-1) UNRELEASED; urgency=low
     + Bump standards version to 3.9.3, no changes needed
     + Bump the build-dependency on octave-pkg-dev to >= 1.0.0
   * Bump debhelper compatibility level to 9
+  * debian/copyright: Update notices and adapted to the 1.0 format
 
  -- Rafael Laboissiere <rafael at laboissiere.net>  Mon, 05 Mar 2012 01:16:38 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 494b837..f6a9445 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,83 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=48
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Specfun package for Octave
-Upstream-Maintainer: The Octave Community <octave-dev at lists.sf.net>
-Upstream-Source: http://octave.sourceforge.net/specfun/index.html
+Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
+Source: http://octave.sourceforge.net/specfun/
 
-Files: inst/Si.m:1, inst/expint.m, inst/zeta.m, inst/heaviside.m,
- inst/expint_E1.m, inst/Ci.m inst/expint_Ei.m, inst/psi.m,
- inst/sinint.m, inst/cosint.m, inst/erfcx.m, inst/dirac.m,
- inst/erfcinv.m
-Copyright: © 2006 Sylvain Pelissier
-License: GPL-2+
+Files: inst/laguerre.m
+Copyright: 2008 Eric Chassande-Mottin
+License: GPL-3+
+
+Files: inst/laplacian.m
+Copyright: 2010-2011 Andrew V. Knyazev
+           2010-2011 Bryan C. Smith
+License: BSD-3
+ 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/ellipke.m
+Copyright: 2001 David Billinghurst
+License: GPL-3+
+
+Files: inst/multinom_coeff.m inst/multinom_exp.m
+Copyright: 2011 Jordi Gutiérrez Hermoso
+           2011 Juan Pablo Carbajal
+License: GPL-3+
 
 Files: inst/lambertw.m
-Copyright: © 1998 Nicol N. Schraudolph
-License: GPL-2+
+Copyright: 1998 by Nicol N. Schraudolph
+License: GPL-3+
 
-Files: src/ellipj.cc
-Copyright: © 2001 Leopoldo Cerbaro
-License: GPL-2+
+Files: inst/sinint.m inst/expint_E1.m inst/erfcinv.m inst/Ci.m inst/cosint.m
+ inst/expint_Ei.m inst/expint.m inst/zeta.m inst/Si.m inst/psi.m
+ inst/dirac.m inst/heaviside.m
+Copyright: 2006 Sylvain Pelissier
+License: GPL-3+
 
-Files: inst/ellipj.m, inst/ellipke.m
-Copyright: © 2001 David Billinghurst
-License: GPL-2+
+Files: inst/multinom.m
+Copyright: 2011 Juan Pablo Carbajal
+License: GPL-3+
 
-Files: debian/*
-Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+Files: src/ellipj.cc
+Copyright: 2001 Leopoldo Cerbaro
 License: GPL-3+
 
-License: GPL-2+
- 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'.
+Files: debian/*
+Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+License: GPL-3+
 
 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'.

-- 
Debian packaging for octave-specfun

