[saga] 01/04: Add dxflib to files-excluded - debian version can be used

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository saga.

commit cbba4350b1e9d7583bfc0577aee4ec154096e25f
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Wed Apr 13 23:25:22 2016 +0200

    Add dxflib to files-excluded - debian version can be used
---
 debian/copyright | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 89b136d..9be51d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,14 @@ Upstream-Contact: Olaf Conrad <oconrad at saga-gis.org>
 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).
 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_svm/svm.cpp
  src/modules/imagery/imagery_svm/svm.h
+ src/modules/io/io_shapes_dxf/dxflib/*
 
 Files: *
 Copyright: 2001-2016, Olaf Conrad
@@ -289,11 +292,6 @@ License: e00compr
  profits or consequential damages, arising out of the use of the
  Software.
 
-Files: src/modules/io/io_shapes_dxf/dxflib/*
-Copyright: 2001, Robert J. Campbell Jr
-      2001-2003, RibbonSoft.
-License: GPL-2 or dxflib-Commercial-License
-
 Files: debian/*
 Copyright: 2010-2014 Johan Van de Wauw <johan.vandewauw at gmail.com>
 License: LGPL-2.1+
@@ -432,19 +430,6 @@ License: BSL-1.0
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License: dxflib-Commercial-License
- Licensees holding valid dxflib Professional Edition licenses may use
- this file in accordance with the dxflib Commercial License
- Agreement provided with the Software.
- .
- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- .
- See http://www.ribbonsoft.com for further details.
- .
- Contact info at ribbonsoft.com if any conditions of this licensing are
- not clear to you.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),

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