[qgis] 02/08: Exclude dxf2shp plugin from repacked upstream tarball, see the copyright file for details of the license issue.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Feb 28 21:38:43 UTC 2015 

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

sebastic pushed a commit to branch master
in repository qgis.

commit 7092a911d52b2b7a51a2f553b4f760226a6d9885
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 28 20:16:46 2015 +0100

    Exclude dxf2shp plugin from repacked upstream tarball, see the copyright file for details of the license issue.
---
 debian/changelog                            |   2 +
 debian/copyright                            | 112 ++++++++++++++--------------
 debian/patches/exclude-dxf2shp-plugin.patch |  19 +++++
 debian/patches/series                       |   1 +
 debian/watch                                |   7 +-
 5 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5f6328..69974d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qgis (2.8.1-1~exp2) UNRELEASED; urgency=medium
 
   * Update copyright file, changes:
     - Document copyright & license for src/core/pal/costcalculator* separately.
+  * Exclude dxf2shp plugin from repacked upstream tarball, see the copyright
+    file for details of the license issue.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Feb 2015 17:59:34 +0100
 
diff --git a/debian/copyright b/debian/copyright
index bc27d93..cdef8ab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,60 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: QGIS
 Upstream-Contact: qgis-developer at lists.osgeo.org
 Source: https://github.com/qgis/QGIS
+Comment: The upstream sources contain the dxf2shp converter plugin that
+ contains GPL-2 (v2 only) licensed files. This is incompatible with the 
+ GPL-3+ license used for libpal and a couple of gradient resources.
+ .
+ For refernec see the FTP master comments in the list archive:
+ http://lists.alioth.debian.org/pipermail/pkg-grass-devel/2015-February/027884.html
+ .
+ The copyright details for the excluded files at time of removal were:
+ .
+  Files: src/plugins/dxf2shp_converter/builder.cpp
+   src/plugins/dxf2shp_converter/builder.h
+  Copyright: 1999, Frank Warmerdam <warmerda at pobox.com>
+  Comment: The code is heavily based on Christopher Michaelis' DXF to
+   Shapefile Converter (http://www.wanderingidea.com/content/view/12/25/),
+   released under GPL License
+   .
+   This code is based on two other products:
+      DXFLIB (http://www.ribbonsoft.com/dxflib.html)
+   This is a library for reading DXF files, also GPL.
+      SHAPELIB (http://shapelib.maptools.org/)
+   Used for the Shapefile functionality.
+  License: MIT
+ .
+  Files: src/plugins/dxf2shp_converter/getInsertions.h
+  Copyright: Christopher Michaelis
+  License: GPL-2
+ .
+  Files: src/plugins/dxf2shp_converter/getInsertions.cpp
+  Copyright: Christopher Michaelis
+  License: GPL-2+
+ .
+  Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/*
+  Copyright: 1999, 2001-2002, Frank Warmerdam
+  License: MIT or LGPL-2+
+ .
+  Files: src/plugins/dxf2shp_converter/dxflib/src/*
+  Copyright: 2001-2003, RibbonSoft
+                  2001, Robert J. Campbell Jr
+  License: GPL-2 or dxflib-Commercial-License
+ .
+  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.
+ .
+Files-Excluded: src/plugins/dxf2shp_converter/*
 
 Files: *
 Copyright:                   Carl Anderson
@@ -284,37 +338,6 @@ Files: src/gui/symbology-ng/characterwidget.cpp
 Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies)
 License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
-Files: src/plugins/dxf2shp_converter/builder.cpp
- src/plugins/dxf2shp_converter/builder.h
-Copyright: 1999, Frank Warmerdam <warmerda at pobox.com>
-Comment: The code is heavily based on Christopher Michaelis' DXF to
- Shapefile Converter (http://www.wanderingidea.com/content/view/12/25/),
- released under GPL License
- .
- This code is based on two other products:
-    DXFLIB (http://www.ribbonsoft.com/dxflib.html)
- This is a library for reading DXF files, also GPL.
-    SHAPELIB (http://shapelib.maptools.org/)
- Used for the Shapefile functionality.
-License: MIT
-
-Files: src/plugins/dxf2shp_converter/getInsertions.h
-Copyright: Christopher Michaelis
-License: GPL-2
-
-Files: src/plugins/dxf2shp_converter/getInsertions.cpp
-Copyright: Christopher Michaelis
-License: GPL-2+
-
-Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/*
-Copyright: 1999, 2001-2002, Frank Warmerdam
-License: MIT or LGPL-2+
-
-Files: src/plugins/dxf2shp_converter/dxflib/src/*
-Copyright: 2001-2003, RibbonSoft
-                2001, Robert J. Campbell Jr
-License: GPL-2 or dxflib-Commercial-License
-
 Files: src/plugins/evis/*
 Copyright: 2007, American Museum of Natural History
 License: LGPL-2+
@@ -1774,33 +1797,6 @@ License: CC-BY-SA-3.0
  .
  Creative Commons may be contacted at http://creativecommons.org/.
 
-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: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 3 or
- version 2 as published by the Free Software Foundation.
- .
- 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: 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
diff --git a/debian/patches/exclude-dxf2shp-plugin.patch b/debian/patches/exclude-dxf2shp-plugin.patch
new file mode 100644
index 0000000..1b1d859
--- /dev/null
+++ b/debian/patches/exclude-dxf2shp-plugin.patch
@@ -0,0 +1,19 @@
+Description: Disable the dxf2shp converter plugin.
+ The plugin contains GPL-2 licensed files, these are incompatible with the
+ GPL-3+ licensed used by libpal that is also included in QGIS.
+ .
+ The plugin is excluded from the repacked upstream tarball.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/src/plugins/CMakeLists.txt
++++ b/src/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@ ADD_SUBDIRECTORY(interpolation)
+ ADD_SUBDIRECTORY(oracle_raster)
+ ADD_SUBDIRECTORY(raster_terrain_analysis)
+ ADD_SUBDIRECTORY(coordinate_capture)
+-ADD_SUBDIRECTORY(dxf2shp_converter)
++#ADD_SUBDIRECTORY(dxf2shp_converter)
+ ADD_SUBDIRECTORY(evis)
+ ADD_SUBDIRECTORY(spatialquery)
+ ADD_SUBDIRECTORY(roadgraph)
diff --git a/debian/patches/series b/debian/patches/series
index fc39b77..5798c0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@ allows-to-typo.patch
 python-env.patch
 disable-doxygen.patch
 developersmap-use-debian-package.patch
+exclude-dxf2shp-plugin.patch
 0001-processing-correctly-handle-tiny-polygons-smaller-th.patch
 0001-backport-ada01603cb7b10786436aa0ed2361743b52ce48f.patch
diff --git a/debian/watch b/debian/watch
index 917e0e3..bd187e0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,6 @@
 version=3
-opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/" \
-http://qgis.org/downloads/ (?:.*/)?(?:rel|v|qgis)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+repacksuffix=+dfsg" \
+http://qgis.org/downloads/ \
+(?:.*/)?(?:rel|v|qgis)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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

More information about the Pkg-grass-devel mailing list