[saga] 01/05: Update copyright file.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Apr 29 13:30:54 UTC 2016


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

sebastic pushed a commit to branch master
in repository saga.

commit a2b1d601974a69d243755e972fbda9ddb58123f8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 14:30:46 2016 +0200

    Update copyright file.
    
    Changes:
    - Group copyright holders by license
    - Use standalone license paragraph for BSD-2-clause & GPL-3+
    - Reorder Files sections for imagery subdirectories
---
 debian/changelog |   6 +++
 debian/copyright | 120 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de78270..452290e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,12 @@ saga (2.2.7+dfsg-1) UNRELEASED; urgency=medium
   * Add misc depends to libsaga
   * Document license for cluster_isodata
 
+  [ Bas Couwenberg ]
+  * Update copyright file, changes:
+    - Group copyright holders by license
+    - Use standalone license paragraph for BSD-2-clause & GPL-3+
+    - Reorder Files sections for imagery subdirectories
+
  -- Johan Van de Wauw <johan at vandewauw.be>  Fri, 04 Mar 2016 17:34:50 +0100
 
 saga (2.2.4+dfsg-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index ce0409a..1a376f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,10 +16,22 @@ Files-Excluded: src/modules/grid/grid_gridding/nn/triangle.c
 Files: *
 Copyright: 2001-2016, Olaf Conrad
            2003-2016, Volker Wichmann
+           2007-2016, Johan Van de Wauw
+           2014-2015, Christian Alwardt
+                2013, Benjamin Bechteld
+                2013, Luca Piras
+                2012, Magnus Bremer
+                2012, Muhammed Setiawan
+           2002-2010, SAGA User Group Association
                 2010, Sun Zhuo
-           2001-2004, Andre Ringeler
+           2001-2009, Andre Ringeler
                 2007, Thomas Schorr
            2003-2006, Victor Olaya
+                2006, Stefan Liersch
+           2001-2004, Andre Ringeler
+                2004, Antonio Boggia
+                2004, Gianluca Massei
+                      Alessandro Perego
 License: GPL-2
 
 Files: ltmain.sh
@@ -40,26 +52,6 @@ Files: src/saga_core/saga_api/clipper.cpp
 Copyright: 2010-2014, Angus Johnson
 License: BSL-1.0
 
-Files: src/modules/*
-Copyright: 2001-2013, Olaf Conrad
-           2002-2010, SAGA User Group Association
-           2003-2006, Victor Olaya
-           2001-2009, Andre Ringeler
-                2007, Thomas Schorr
-           2003-2011, Volker Wichmann
-                2004, Antonio Boggia
-                2004, Gianluca Massei
-                2006, Stefan Liersch
-                       Alessandro Perego
-           2007-2016, Johan Van de Wauw
-                2010, Volker Wichmann
-                2013, Benjamin Bechteld
-                2012, Magnus Bremer
-                2012, Muhammed Setiawan
-                2013, Luca Piras
-           2014-2015, Christian Alwardt
-License: GPL-2
-
 Files: src/modules/db/db_odbc/otlv4.h
 Copyright: 1996-2010, Sergei Kuchin <skuchin at gmail.com>
 License: OpenBSD-License
@@ -220,34 +212,14 @@ Copyright:    2004-2010, Victor Olaya <volaya at ya.com>
         2004-2010, 2015, Volker Wichmann
 License: GPL-2+
 
-Files: src/modules/imagery/imagery_tools/landsat_toar_core.cpp
-Copyright: 2000-2005, Liam Girdwood
-                2006, E. Jorge Tizado
-Comment: Contains code modified from libnova-0.12, grass
-License: GPL-2
-
-Files: src/modules/grid/grid_gridding/nn/* src/modules/grid/grid_spline/csa.*
+Files: src/modules/grid/grid_gridding/nn/*
+ src/modules/grid/grid_spline/csa.*
 Copyright: 2000-2008, Pavel Sakov and CSIRO
-License: BSD-4-clause
- Redistribution and use of material from the package `nn', with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-    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: BSD-2-clause
+
+Files: src/modules/imagery/imagery_classification/cluster_isodata.cpp
+Copyright: 2016, Olaf Conrad
+License: GPL-3+
 
 Files: src/modules/imagery/imagery_maxent/me.cpp
  src/modules/imagery/imagery_maxent/me.h
@@ -261,6 +233,12 @@ License: maxent
  purpose is made. It is provided "as is" without express or implied
  warranty.
 
+Files: src/modules/imagery/imagery_tools/landsat_toar_core.cpp
+Copyright: 2000-2005, Liam Girdwood
+                2006, E. Jorge Tizado
+Comment: Contains code modified from libnova-0.12, grass
+License: GPL-2
+
 Files: src/modules/io/io_esri_e00/e00compr/cpl_conv.c
  src/modules/io/io_esri_e00/e00compr/cpl_conv.h
  src/modules/io/io_esri_e00/e00compr/cpl_error.c
@@ -292,14 +270,6 @@ License: e00compr
  profits or consequential damages, arising out of the use of the
  Software.
 
-Files: src/modules/imagery/imagery_classification/cluster_isodata.cpp
-Copyright: 2016 Olaf Conrad
-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.
-
 Files: debian/*
 Copyright: 2010-2014 Johan Van de Wauw <johan.vandewauw at gmail.com>
 License: LGPL-2.1+
@@ -368,6 +338,23 @@ License: GPL-2+ with Libtool exception
  On Debian systems, the complete text of version 2 of the GNU General
  Public License can be found in `/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 `/usr/share/common-licenses/GPL-3'.
+
 License: LGPL-2.1
  This library is free software; you can redistribute
  it and/or modify it under the terms of the GNU Lesser
@@ -413,6 +400,27 @@ License: LGPL-2.1+
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2.1'.
 
+License: BSD-2-clause
+ Redistribution and use of material from the package `nn', with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+    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: BSL-1.0
  Boost Software License - Version 1.0 - August 17th, 2003
  .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git



More information about the Pkg-grass-devel mailing list