[qgis] 01/19: Update watch file & Files-Excluded for 2.14 release.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Feb 26 19:45:56 UTC 2016 

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

sebastic pushed a commit to branch master
in repository qgis.

commit f85c63aa845741fbc50ac3efe5bc770cdda6e657
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 20 18:18:12 2016 +0100

    Update watch file & Files-Excluded for 2.14 release.
---
 debian/copyright | 92 +++++++++++++++++++++++++-------------------------------
 debian/watch     |  2 +-
 2 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d84e57e..6c251a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,62 +2,17 @@ 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.
+Comment: The upstream tarball is repacked to exclude files with
+ problematic licenses.
  .
- The "Do not Rip/Merge with other artists work" clause for the ElvenSword
- gradient is another problem.
+ The ElvenSword gradient is excluded because its license contains the
+ "Do not Rip/Merge with other artists work" clause limiting derived works.
  .
  For reference 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: resources/cpt-city-qgis-min/es/*
   Copyright: 2008, ElvenSword (http://elvensword.deviantart.com/)
   Comment: Credit requested for use, required for distribution
@@ -96,8 +51,7 @@ Comment: The upstream sources contain the dxf2shp converter plugin that
    .
    * Thanks
  .
-Files-Excluded: src/plugins/dxf2shp_converter/*
- resources/cpt-city-qgis-min/es/*
+Files-Excluded: resources/cpt-city-qgis-min/es/*
 
 Files: *
 Copyright:                   Carl Anderson
@@ -381,6 +335,29 @@ 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/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+
@@ -1802,6 +1779,19 @@ 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 as
diff --git a/debian/watch b/debian/watch
index baa20fb..98edba5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,4 +4,4 @@ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
 repacksuffix=+dfsg \
 http://qgis.org/downloads/ \
-(?:.*/)?(?:rel|v|qgis)[\-\_](2\.8\.\d[\d\-\.]*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+(?:.*/)?(?:rel|v|qgis)[\-\_](2\.14\.\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