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

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 4d8397670e77b93e50fe5d5659535f4daa04f969
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Wed Mar 14 12:01:18 2012 +0100

    debian/copyright: update to machine-readable format 1.0

diff --git a/debian/copyright b/debian/copyright
index a7a1ee6..45e850d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,16 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=48
-Upstream-Name: strings package for Octave
-Upstream-Maintainer: The Octave Community <octave-dev at lists.sf.net>
-Upstream-Source: http://octave.sourceforge.net/strings/index.html
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+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/cstrcmp.m, inst/strjoin.m, inst/base64decode.m
-Copyright: © 2007 Muthiah Annamalai
+Files: inst/base64decode.m inst/cstrcmp.m inst/editdistance.m
+ inst/strjoin.m
+Copyright: 2006-2007 Muthiah Annamalai <muthiah.annamalai at uta.edu>
 License: GPL-2+
 
-Files: inst/editdistance.m
-Copyright: © 2006 Muthiah Annamalai
-License: GPL-2+
-
-Files: ./src/pcregexp.cc
-Copyright: © 2004 Stefan van der Walt
-License: other
+Files: src/pcregexp.cc
+Copyright: 2004, Stefan van der Walt <stefan at sun.ac.za>
+License: BSD-2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -36,22 +33,54 @@ License: other
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: inst/base64encode.m
+Copyright: Paul Kienzle
+License: other
+ This program is public domain
+
 Files: inst/strsort.m
-Copyright: © Paul Kienzle
-License: PD
+Copyright: Paul Kienzle
+License: other
  This program is public domain
 
 Files: debian/*
-Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+Copyright: 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+           2008-2011 Thomas Weber <tweber at debian.org>
+           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
+ 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-strings