[Pkg-octave-commit] [SCM] Debian packaging for octave-strings branch, master, updated. bf6ae6ee5bce36d962d1b2a00ab3ef4c0bbca97d

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 354f6d48cac00e30e2e082e39202542d3da6385d
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri Mar 16 22:13:02 2012 +0100

    Update copyright file for upstream release 1.1.0
    
    Git-Dch: Ignore

diff --git a/debian/copyright b/debian/copyright
index 45e850d..11e304d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,13 @@ Upstream-Name: Strings package for Octave
 Upstream-Contact: The Octave Community <octave-dev at lists.sf.net>
 Source: http://octave.sourceforge.net/strings/
 
-Files: inst/base64decode.m inst/cstrcmp.m inst/editdistance.m
- inst/strjoin.m
+Files: inst/base64decode.m inst/editdistance.m inst/strjoin.m
 Copyright: 2006-2007 Muthiah Annamalai <muthiah.annamalai at uta.edu>
-License: GPL-2+
+License: GPL-3+
+
+Files: inst/cstrcmp.m
+Copyright: 2012 Carnë Draug <carandraug+dev at gmail.com>
+License: GPL-3+
 
 Files: src/pcregexp.cc
 Copyright: 2004, Stefan van der Walt <stefan at sun.ac.za>
@@ -36,12 +39,12 @@ License: BSD-2
 Files: inst/base64encode.m
 Copyright: Paul Kienzle
 License: other
- This program is public domain
+ This program is granted to the public domain
 
 Files: inst/strsort.m
 Copyright: Paul Kienzle
 License: other
- This program is public domain
+ This program is granted to the public domain
 
 Files: debian/*
 Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
@@ -49,24 +52,6 @@ Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
            2008, 2009, 2012 Rafael Laboissiere <rafael at laboissiere.net>
 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

-- 
Debian packaging for octave-strings