[saga] 01/06: Also exclude GPL-3+ licensed files from repacked upstream tarballs.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository saga.

commit 586b3dfecc5dda2c037ff08e47b3cd934ad215dd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 3 20:58:19 2016 +0200

    Also exclude GPL-3+ licensed files from repacked upstream tarballs.
---
 debian/changelog |  7 +++++++
 debian/copyright | 26 ++++----------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d7393a..59b6592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+saga (2.3.0+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Also exclude GPL-3+ licensed files from repacked upstream tarballs.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 Jul 2016 20:57:29 +0200
+
 saga (2.3.0+dfsg-1~exp1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index a2c1211..b32ffe5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,10 +5,13 @@ Source: http://www.saga-gis.org
 Comment: Saga is generally licensed using two licenses:
  LGPL-2.1 for the libraries and GPL-2 for the rest of the program.
  Excluded files are non-free (triangle and firelib) or are already packaged 
- in debian (svm and dxflib).
+ in debian (svm and dxflib). GPL-3+ licensed files like cluster_isodata.cpp
+ are also excluded because the license is incompatible with GPL-2 (v2 only)
+ used for most of SAGA.
 Files-Excluded: src/modules/grid/grid_gridding/nn/triangle.c
  src/modules/grid/grid_gridding/nn/triangle.h
  src/modules/simulation/sim_fire_spreading/fireLib.*
+ src/modules/imagery/imagery_classification/cluster_isodata.cpp
  src/modules/imagery/imagery_svm/svm.cpp
  src/modules/imagery/imagery_svm/svm.h
  src/modules/io/io_shapes_dxf/dxflib/*
@@ -217,10 +220,6 @@ Files: src/modules/grid/grid_gridding/nn/*
 Copyright: 2000-2008, Pavel Sakov and CSIRO
 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
 Copyright: 2003, Dekang Lin <lindek at cs.ualberta.ca>
@@ -338,23 +337,6 @@ 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

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