[Pkg-octave-commit] [SCM] octave-signal branch, master, updated. 7bf43f26b24bd6d522d2d038565b38e70937a261

Rafael Laboissiere rafael at debian.org
Fri May 22 02:51:20 UTC 2009 

The following commit has been merged in the master branch:
commit 7bf43f26b24bd6d522d2d038565b38e70937a261
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 22 04:51:19 2009 +0200

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 39060e8..53de88a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ octave-signal (1.0.9-1) UNRELEASED; urgency=low
     + (Standards-Version): Bump to 3.8.1 (no changes needed)
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
-  * debian/copyright: Use DEP5 URL in Format-Specification
+  * debian/copyright:
+    + Use DEP5 URL in Format-Specification
+    + Use separate License stanzas for instructing about the location of
+      the different licenses used in the package
   * debian/rules: Fix wrong permission of script sampled2continuous.m
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:47:25 +0200
diff --git a/debian/copyright b/debian/copyright
index c37cbcc..1444dbe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,19 +6,16 @@ Upstream-Source: http://octave.sourceforge.net/signal/index.html
 Files: inst/filtic.m
 Copyright: © 2004 David Billinghurst
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/firls.m
 Copyright: © 2006 Quentin Spencer
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/pburg.m, inst/ar_psd.m, inst/arburg.m, inst/cohere.m,
  inst/pyulear.m, inst/csd.m, inst/tfe.m, inst/pwelch.m,
  inst/mscohere.m, inst/tfestimate.m, inst/cpsd.m
 Copyright: © 2006 Peter V. Lanspeary
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/gaussian.m, inst/cheby2.m, inst/buttord.m,
  inst/filtfilt.m, inst/gausswin.m, inst/sftrans.m, inst/butter.m,
@@ -27,17 +24,14 @@ Files: inst/gaussian.m, inst/cheby2.m, inst/buttord.m,
  inst/rceps.m
 Copyright: © 1999 Paul Kienzle
 License: GPL-2+
- These file are under the GPL, version 2 or later.
 
 Files: inst/specgram.m, inst/chirp.m
 Copyright: © 1999-2000 Paul Kienzle
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/xcorr.m
 Copyright: © 1999-2001 Paul Kienzle
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/kaiserord.m, inst/interp.m, inst/xcorr2.m, inst/fir1.m,
  inst/resample.m, inst/boxcar.m, src/medfilt1.cc, inst/cheb2ord.m,
@@ -45,62 +39,52 @@ Files: inst/kaiserord.m, inst/interp.m, inst/xcorr2.m, inst/fir1.m,
  inst/cheb1ord.m, inst/fir2.m, inst/triang.m
 Copyright: © 2000 Paul Kienzle
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/sgolay.m, inst/dct2.m, inst/idct.m, inst/tripuls.m,
  inst/idct2.m, inst/polystab.m, inst/dctmtx.m, inst/sgolayfilt.m,
  inst/dct.m
 Copyright: © 2001 Paul Kienzle
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/upsample.m, inst/square.m, inst/idst.m, inst/dst.m,
  inst/downsample.m
 Copyright:  Paul Kienzle
 License: PD
- Thiese functions are public domain
 
 Files: inst/tukeywin.m
 Copyright: © 2007 Laurent Mazet
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/invfreqs.m, inst/invfreq.m, inst/invfreqz.m
 Copyright: © 1986, 2003 Julius O. Smith III
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/freqs.m, inst/freqs_plot.m
 Copyright: © 2003 Julius O. Smith III
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/grpdelay.m
 Copyright: © 2004 Julius O. Smith III
 License: GPL-2+
- This file is under the GPL, version 2 or later.
+
 
 Files: inst/sos2zp.m, inst/residued.m, inst/zp2sos.m, inst/residuez.m,
  inst/cplxreal.m, inst/sos2tf.m, inst/tf2sos.m
 Copyright: © 2005 Julius O. Smith III
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/ncauer.m, inst/__ellip_ws_min.m, inst/ellip.m,
  inst/ellipdemo.m, inst/ellipord.m, inst/__ellip_ws.m
 Copyright: © 2001 Paulo Neis
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/filtfilt.m
 Copyright: © 2007 Francesco Potortì
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/cheb.m, inst/chebwin.m, inst/qp_kaiser.m
 Copyright: © 2002 André Carezia
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files, inst/upfirdn.m, inst/diric.m, inst/morlet.m, inst/mexihat.m,
  inst/shanwavf.m, inst/bohmanwin.m, inst/bitrevorder.m,
@@ -108,123 +92,53 @@ Files, inst/upfirdn.m, inst/diric.m, inst/morlet.m, inst/mexihat.m,
  inst/gmonopuls.m, inst/parzenwin.m, inst/meyeraux.m, inst/gauspuls.m
 Copyright: © 2007 Sylvain Pelissier
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/hilbert.m,
 Copyright: © 2007 Peter L. Soendergaard
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/convmtx.m, inst/dftmtx.m
 Copyright: © 2003 David Bateman
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/levinson.m,
 Copyright: © 1995 Friedrich Leisch
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/kaiser.m
 Copyright: © 1995, 1996, 1997  Kurt Hornik
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/sawtooth.m,
 Copyright: © 2007 Juan Aguado
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/cceps.m
 Copyright: © 1994 Dept of Probability Theory and Statistics TU Wien
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: inst/czt.m
 Copyright: © 2004 Daniel Gunyan
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
-Files: inst/welchwin.m, inst/blackmannuttall.m
+5AFiles: inst/welchwin.m, inst/blackmannuttall.m
 Copyright: © 2007 Muthiah Annamalai
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: src/remez.cc,
 Copyright: © 1995, 1998 Jake Janovetz
 License: GPL-2+
- This file is under the GPL, version 2 or later.
 
 Files: debian/*
 Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
 License: GPL-3+
- The Debian packaging information is under the GPL, version 3 or later.
-
-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. The
-complete text of the GNU General Public License, version 3, can be found
-in the file `/usr/share/common-licenses/GPL-3.
-
-
-This package was debianized by Olafur Jens Sigurdsson <ojsbug at gmail.com> on
-Tue, 19 Feb 2008 00:55:50 +0100
-
-It was downloaded from http://octave.sf.net
-
-Upstream Authors:
-
-	 Paul Kienzle <pkienzle at users.sf.net>
-	 Jake Janovetz <janovetz at uiuc.edu>
-	 Peter V. Lanspeary
-	 Sylvain Pelissier <sylvain.pelissier at gmail.com>
-	 Muthiah Annamalai <muthiah.annamalai at uta.edu>
-	 Dept of Probability Theory and Statistics TU Wien <??>
-	 André Careza <acarezia at uol.com.br>
-	 Julius O. Smith III <jos at ccrma.stanford.edu>
-	 Daniel Gunyan
-	 David Bateman <David.Bateman at motorla.com>
-	 Paulo Neis <p_neis at yahoo.com.br>
-	 David Billinghurst
-	 Quentin Spencer
-	 Peter L. Soendergaard
-	 Kurt Hornik <Kurt.Hornik at ci.tuwien.ac.at>
-	 Friedrich Leisch <Friedrich.Leisch at ci.tuwien.ac.at>
-	 Dave Cogdell <cogdelld at asme.org>
-	 Andreas Weingessel <Andreas.Weingessel at ci.tuwien.ac.at>
-
-Copyright:
-
-    Copyright (C) 2001 Paul Kienzle
-    Copyright (c) 1995,1998  Jake Janovetz
-    Copyright (C) 2006 Peter V. Lanspeary
-    Copyright (C) 2007 Sylvain Pelissier
-    Copyright (C) 2007 Muthiah Annamalai
-    Copyright (C) 1994 Dept of Probability Theory and Statistics TU Wien
-    Copyright (C) 2002 André Carezi
-    Copyright (C) 2006 Peter V. Lanspeary
-    Copyright (C) 2003 David Bateman
-    Copyright (C) 2005 Julius O. Smith III
-    Copyright (C) 2004 Daniel Gunyan
-    Copyright (C) 2001 Paulo Neis
-    Copyright (C) 2004 David Billinghurst
-    Copyright (C) 2006 Quentin Spencer
-    Copyright (C) 2007 Peter L. Soendergaard
-    Copyright (C) 1995, 1996, 1997  Kurt Hornik
-    Copyright (C) 2007 Laurent Mazet
-    Copyright (C) 2000 Dave Cogdell
-
-License: GPL-2+
- This package 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.
-
- Some files are also provided as public domain, namely downsample.m,
- dst.m flattopwin.m, hann.m, idst.m, square.m and upsample.m
-
-On Debian systems, the complete text of the GNU General Public License,
-version 2, can be found in file `/usr/share/common-licenses/GPL-2.
-
-The Debian packaging is (C) 2007, Olafur Jens Sigurdsson <ojsbug at gmail.com> and
-is licensed under the GNU General Public License, version 3 or later,
-see `/usr/share/common-licenses/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'.
+
+License: GPL-3+
+ 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'.

-- 
octave-signal

More information about the Pkg-octave-commit mailing list