[Pkg-octave-commit] [SCM] Debian packaging for octave-nan branch, master, updated. debian/2.4.4-1-8-g9f7deaa

Mon Mar 12 21:29:15 UTC 2012

The following commit has been merged in the master branch:
commit 4cb27bf65bd6cb32b20359ee9f0a28f8da51169d
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Mar 12 21:32:25 2012 +0100

    debian/copyright: update to machine-readable format 1.0

diff --git a/debian/copyright b/debian/copyright
index 2925c49..514a0b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: NaN package for Octave
 Upstream-Contact: Alois Schloegl <alois.schloegl at gmail.com>
 Source: http://octave.sourceforge.net/nan/
@@ -10,10 +10,10 @@ License: GPL-3+
 Files: inst/mahal.m inst/kurtosis.m inst/center.m inst/trimean.m inst/cov.m
        inst/cor.m inst/rankcorr.m inst/tinv.m inst/mad.m inst/norminv.m
        inst/nantest.m inst/normcdf.m inst/coefficient_of_variation.m
-       inst/meansq.m inst/median.m inst/nanconv2.m inst/percentile.m
+       inst/meansq.m inst/median.m inst/percentile.m
        inst/tpdf.m inst/zscore.m inst/hist2res.m inst/meandev.m inst/rms.m
        inst/sumsq.m inst/normpdf.m inst/harmmean.m inst/prctile.m
-Copyright: 1996-2010 Alois Schloegl <alois.schloegl at gmail.com>
+Copyright: 1996-2011 Alois Schloegl <alois.schloegl at gmail.com>
 License: GPL-2+
 
 Files: src/predict.c src/linear.cpp src/linear.h src/tron.h src/tron.cpp
@@ -24,7 +24,7 @@ License: GPL-3+
 
 Files: src/svmtrain_mex.cpp src/svmpredict_mex.cpp src/svm.cpp
 Copyright: 2000-2009 Chih-Chung Chang and Chih-Jen Lin
-           2010 Alois Schloegl <alois.schloegl at gmail.com>
+           2010-2011 Alois Schloegl <alois.schloegl at gmail.com>
 License: GPL-3+
 
 Files: src/svm.h src/svm_model_matlab.h
@@ -52,44 +52,10 @@ Copyright: 2003 Patrick Houweling
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2008 Rafael Laboissiere
-License: GPL-3+
-
+Copyright: 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+
- 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'.
-
-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: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
@@ -118,3 +84,40 @@ License: BSD-3-clause
  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-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: 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-nan

