[Pkg-octave-commit] [SCM] Debian packaging for octave-benchmark branch, master, updated. 13d2986db1bae13eace2eff3e51e63eee881821b

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit d6bed4474329b58f209fa5589db6bc14d57f3e72
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Thu Mar 29 10:05:28 2012 +0200

    debian/copyright: update to machine-readable format 1.0

diff --git a/debian/copyright b/debian/copyright
index 3c1a294..8d2d8a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,26 +1,53 @@
-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: benchmark package for Octave
-Upstream-Maintainer: Jaroslav Hajek <highegg at gmail.com>
-Upstream-Source: http://octave.sourceforge.net/benchmark/index.html
+Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
+Source: http://octave.sourceforge.net/benchmark/
 
-Files: debian/*
-Copyright: © 2009 Rafael Laboissiere <rafael at debian.org>
-License: GPL-3+
-
-Files: inst/benchmark_index.m, inst/benchmark_permute.m
-Copyright: © 2009 VZLU Prague
+Files: inst/*.m
+Copyright: 2008 Jaroslav Hajek <highegg at gmail.com>
 License: GPL-2+
 
-Files: *
-Copyright: © 2008 Jaroslav Hajek <highegg at gmail.com>
+Files: inst/benchmark_index.m inst/benchmark_permute.m
+Copyright: 2009 VZLU Prague
 License: GPL-2+
 
+Files: debian/*
+Copyright: 2009, 2010, 2012 Rafael Laboissiere <rafael at laboissiere.net>
+           2010, 2011 Thomas Weber <tweber at debian.org>
+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
+ 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-benchmark