[qgis] 02/07: Also exclude ElvenSword gradient from repacked upstream tarball, has problematic license terms restricting use.

Tue Mar 3 08:38:07 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 93c9bf7dead6b571404fa7cd83f13105ce7c5d14
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 3 00:27:21 2015 +0100

    Also exclude ElvenSword gradient from repacked upstream tarball, has problematic license terms restricting use.
---
 debian/changelog |  2 ++
 debian/copyright | 80 +++++++++++++++++++++++++++++---------------------------
 debian/watch     |  2 +-
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d6e55a..309b9b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qgis (2.8.1+dfsg-1~exp2) UNRELEASED; urgency=medium
 
   * Fix upstream version extraction from changelog.
   * Move python-qgis from Recommends to Depends.
+  * Also exclude ElvenSword gradient from repacked upstream tarball,
+    has problematic license terms restricting use.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Feb 2015 22:42:25 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 8f581e7..4d9a61b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,9 @@ 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.
  .
+ The "Do not Rip/Merge with other artists work" clause for the ElvenSword
+ gradient is another problem.
+ .
  For reference see the FTP master comments in the list archive:
  http://lists.alioth.debian.org/pipermail/pkg-grass-devel/2015-February/027884.html
  .
@@ -55,7 +58,46 @@ Comment: The upstream sources contain the dxf2shp converter plugin that
    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
+  License: ElvenSword
+   For use:
+   .
+   * Using for commercial works, prints:
+   Yes. There is no need ask permission first, or after.
+   My resources are free for personal or commercial arts works. Credit is
+   enough if possible, if there is a description. Note link to me not
+   necessary. But it is good, I can not see them otherwise, feel free
+   about it.
+   .
+   * Using in only DA:
+   I submit them only DA yes, but you may use out of DA.
+   .
+   For distribute:
+   .
+   * I like sharing. So okay distributing my resources with credit,
+   for good, for free. But,
+   .
+   * Do not distribute my resource files without original preview.
+   ('cause previews including credit. Credit is important point on
+   this situation.)
+   .
+   * Do not remove my name on it (preview). I saw some Turkish and
+   Russian forum sites delete artists names though, and they puting
+   their own cursed crappy logos on the previews. It is not sharing.
+   It is ...
+   .
+   * Do not create collection with new preview, claiming open or close
+   they're your own creations.
+   .
+   * Do not Rip/Merge with other artists work. Example: All in one
+   gradients by Merger/Ripper Nickname) for download/sell
+   .
+   * Thanks
+ .
 Files-Excluded: src/plugins/dxf2shp_converter/*
+ resources/cpt-city-qgis-min/es/*
 
 Files: *
 Copyright:                   Carl Anderson
@@ -580,44 +622,6 @@ Files: resources/cpt-city-qgis-min/ds9/*
 Copyright: 2010, William Joye
 License: GPL-3+
 
-Files: resources/cpt-city-qgis-min/es/*
-Copyright: 2008, ElvenSword (http://elvensword.deviantart.com/)
-Comment: Credit requested for use, required for distribution
-License: ElvenSword
- For use:
- .
- * Using for commercial works, prints:
- Yes. There is no need ask permission first, or after.
- My resources are free for personal or commercial arts works. Credit is
- enough if possible, if there is a description. Note link to me not
- necessary. But it is good, I can not see them otherwise, feel free
- about it.
- .
- * Using in only DA:
- I submit them only DA yes, but you may use out of DA.
- .
- For distribute:
- .
- * I like sharing. So okay distributing my resources with credit,
- for good, for free. But,
- .
- * Do not distribute my resource files without original preview.
- ('cause previews including credit. Credit is important point on
- this situation.)
- .
- * Do not remove my name on it (preview). I saw some Turkish and
- Russian forum sites delete artists names though, and they puting
- their own cursed crappy logos on the previews. It is not sharing.
- It is ...
- .
- * Do not create collection with new preview, claiming open or close
- they're your own creations.
- .
- * Do not Rip/Merge with other artists work. Example: All in one
- gradients by Merger/Ripper Nickname) for download/sell
- .
- * Thanks
-
 Files: resources/cpt-city-qgis-min/fme/*
 Copyright: 2005, Fred M. Erickson
 License: GPL-2+
diff --git a/debian/watch b/debian/watch
index bd187e0..919d5fa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
 version=3
 opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
-repacksuffix=+dfsg" \
+repacksuffix=+dfsg1" \
 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

