[plplot] 01/01: Update license of csiro and nn libraries (BSD-2-Clause)

Ole Streicher olebole at moszumanska.debian.org
Mon Aug 28 06:38:24 UTC 2017


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

olebole pushed a commit to branch master
in repository plplot.

commit ac5f9b3938fedc161603fb2192484d1f71c47876
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Aug 28 08:37:47 2017 +0200

    Update license of csiro and nn libraries (BSD-2-Clause)
    
    Also reformat all licenses
---
 debian/copyright | 235 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 126 insertions(+), 109 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 7db32ed..8bc97ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -96,80 +96,105 @@ License: plplot-doc
 Files: data/*.shp
  data/*.shx
 Copyright: 2008-2012 Nathaniel Vaughn Kelso and Tom Patterson
-License: public-domain
+License: OS-OpenData
 Comment: The shapefiles (.shx and .shp files) supplied with PLplot are
  in the public domain. The data is downloaded from the free resource
  Natural Earth (www.naturalearthdata.com).
 
 Files: lib/nn/* lib/csa/*
-Copyright: 2000-2002 CSIRO Marine Research
-License: non-commercial
- There is no warranty whatsoever.  Use at your own risk.
- .
- These code may be freely redistributed under the condition that the copyright
- notices are not removed. You may distribute modified versions of this code
- UNDER THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
- SAME FILE REMAIN UNDER COPYRIGHT OF CSIRO, BOTH SOURCE AND OBJECT CODE ARE
- MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR NOTICE IS GIVEN OF THE
- MODIFICATIONS.
-Comment: Not DFSG compatible, under discussion with upstream
+Copyright: 2003-2017 Alan W. Irwin,
+ 2009-2011 Andrew Ross,
+ 2005-2012 Arjen Markus,
+ 2005 Geoffrey Furnish,
+ 2006 Hazen Babcock,
+ 2010 Hezekiah M. Carty,
+ 2003 Joao Cardoso,
+ 2003-2005 Rafael Laboissiere,
+ 2006-2009 Werner Smekal,
+ 2000-2008 Pavel Sakov and CSIRO
+License: BSD-2-Clause
 
 License: LGPL-2+
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-    .
-    This library 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
-    Library General Public License for more details.
-    .
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-    .
-    On Debian systems, the full text of the GNU Library General Public
-    License version 2 can be found in the file
-    `/usr/share/common-licenses/LGPL-2'.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2'.
 
 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.
-   .
-   On Debian systems, the full text of the GNU General Public License
-   version 2 can be found in the file `/usr/share/common-licenses/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.
+ .
+ On Debian systems, the full 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
- Copyright (c) <YEAR>, <OWNER>
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
  .
- 1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 1) Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
  .
- 2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 2) Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution. 
  .
- 3) Neither the name of the ORGANIZATION nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ 3) Neither the name of the ORGANIZATION nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission. 
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PRO [...]
-
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ AND ON ANY THEORY OF 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: MIT
- ******************************************************************************
- Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
- and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+License: BSD-2-Clause
+ Redistribution and use of material from the package, with or without
+ modification, are permitted provided that the following conditions
+ are met:
  .
-			All Rights Reserved
+  1. Redistributions of material must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+  2. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
  .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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: MIT
  Permission to use, copy, modify, and distribute this software and its
  documentation for any purpose and without fee is hereby granted,
  provided that the above copyright notice appear in all copies and that
@@ -185,8 +210,6 @@ License: MIT
  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
- ******************************************************************************
-
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
@@ -209,55 +232,49 @@ License: Expat
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 License: plplot-doc
- The documentation files are distributed under the following license terms:
-  ===========================================================================
-    .
-    Redistribution and use in source (XML DocBook) and "compiled" forms
-    (HTML, PDF, PostScript, DVI, TeXinfo and so forth) with or without
-    modification, are permitted provided that the following conditions are
-    met:
-    .
-       1. Redistributions of source code (XML DocBook) must retain the
-	  above copyright notice, this list of conditions and the following
-	  disclaimer as the first lines of this file unmodified.
-    .
-       2. Redistributions in compiled form (transformed to other DTDs,
-	  converted to HTML, PDF, PostScript, and other formats) must
-	  reproduce the above copyright notice, this list of conditions and
-	  the following disclaimer in the documentation and/or other
-	  materials provided with the distribution.
-    .
-    Important: THIS DOCUMENTATION IS PROVIDED BY THE PLPLOT PROJECT "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PLPLOT PROJECT BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION,
-    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    .
-  ===========================================================================
-
+ Redistribution and use in source (XML DocBook) and "compiled" forms
+ (HTML, PDF, PostScript, DVI, TeXinfo and so forth) with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+  1. Redistributions of source code (XML DocBook) must retain the
+     above copyright notice, this list of conditions and the following
+     disclaimer as the first lines of this file unmodified.
+ .
+  2. Redistributions in compiled form (transformed to other DTDs,
+     converted to HTML, PDF, PostScript, and other formats) must
+     reproduce the above copyright notice, this list of conditions and
+     the following disclaimer in the documentation and/or other
+     materials provided with the distribution.
+ .
+ Important: THIS DOCUMENTATION IS PROVIDED BY THE PLPLOT PROJECT "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PLPLOT PROJECT BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: public-domain
-  Data from Natural Earth is released under the following conditions:
-  -------------------------------------------------------------------
-  .
-  All versions of Natural Earth raster + vector map data found on this website are in the public domain. You may use the maps in any manner, including modifying the content and design, electronic dissemination, and offset printing. The primary authors, Tom Patterson and Nathaniel Vaughn Kelso, and all other contributors renounce all financial claim to the maps and invites you to use them for personal, educational, and commercial purposes.
-  .
-  No permission is needed to use Natural Earth. Crediting the authors is unnecessary.
-  .
-  However, if you wish to cite the map data, simply use one of the following.
-  .
-  Short text:
-  Made with Natural Earth.
-  .
-  Long text:
-  Made with Natural Earth. Free vector and raster map data @ naturalearthdata.com.
-  .
-  Any other files marked as public domain:
-  ----------------------------------------
-  Any file in plplot marked as public domain is free from any restriction on redistribution.
+License: OS-OpenData
+ All versions of Natural Earth raster + vector map data found on this
+ website are in the public domain. You may use the maps in any manner,
+ including modifying the content and design, electronic dissemination,
+ and offset printing. The primary authors, Tom Patterson and Nathaniel
+ Vaughn Kelso, and all other contributors renounce all financial claim
+ to the maps and invites you to use them for personal, educational,
+ and commercial purposes.
+ .
+ No permission is needed to use Natural Earth. Crediting the authors
+ is unnecessary.
+ .
+ However, if you wish to cite the map data, simply use one of the following.
+ .
+ Short text:
+ Made with Natural Earth.
+ .
+ Long text:
+ Made with Natural Earth. Free vector and raster map data @ naturalearthdata.com.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git



More information about the debian-science-commits mailing list