[Pkg-octave-commit] [octave-odepkg] 03/03: d/copyright: Reflect upstream changes

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-odepkg.

commit 45ff9d359fe5f5f5c2f1ff6ed20ddcb15e567511
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Thu May 21 04:00:52 2015 -0300

    d/copyright: Reflect upstream changes
---
 debian/copyright | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3430270..ee31817 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,11 +20,11 @@ Copyright: 2012 Davide Prandi <davide_prandi at hotmail.it>
            2012 Carlo de Falco
 License: GPL-2+
 
-Files: src/cash/*.f
+Files: src/cash.tgz
 Copyright: 2007 Jeff R. Cash <j.cash at imperial.ac.uk>
 License: GPL-2+
 
-Files: src/daskr/*.f
+Files: src/daskr.tgz
 Copyright: 2002 The Regents of the University of California
 License: BDS-3
  Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ License: BDS-3
  (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: src/hairer/*.f
+Files: src/hairer.tgz
 Copyright: 2004 Ernst Hairer
 License: BSD-2
  Redistribution and use in source and binary forms, with or without 
@@ -101,15 +101,13 @@ License: other
 Files: debian/*
 Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
            2008-2011 Thomas Weber <tweber at debian.org>
-           2008, 2009, 2012, 2013 Rafael Laboissiere <rafael at laboissiere.net>
+           2008, 2009, 2012, 2013, 2015 Rafael Laboissiere <rafael at laboissiere.net>
            2012 Sébastien Villemot <sebastien 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 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
@@ -117,17 +115,17 @@ License: GPL-2+
  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/>.
+ 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, version 3, can be found in the file
+ `/usr/share/common-licenses/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.
+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
@@ -135,8 +133,8 @@ License: GPL-3+
  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/>.
+ 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, version 2, can be found in the file
+ `/usr/share/common-licenses/GPL-2'.

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-odepkg.git