[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-50-g3134a07

Jérémy Lal kapouer at melix.org
Mon Aug 12 19:12:21 UTC 2013


The following commit has been merged in the master branch:
commit 3a5c2ead955be2003dacce395c564c55d035e052
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon Aug 12 21:04:31 2013 +0200

    agg_conv_gpc.h refers to non-free software but isn't part of it.

diff --git a/debian/copyright b/debian/copyright
index f877e23..d53123d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: https://github.com/mapnik/mapnik/issues
 Source: https://github.com/mapnik/mapnik/
  Repackaged to exclude non-DFSG files in
- ./deps/agg/include/agg_conv_gpc.h (from non-free software)
  ./tests/data/fonts/XB\ Zar.ttf (cannot find upstream)
  ./tests/data/fonts/LICENCE.txt (refers to a dead url)
  Conveniently, remove unused software to simplify this file maintenance:
diff --git a/debian/rules b/debian/rules
index b93bd00..e2d0d6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,7 +93,6 @@ get-orig-source:
 	@rm -r mapnik-$(UPVER)/fonts/dejavu*
 	@rm mapnik-$(UPVER)/fonts/unifont*
 	@rm -r mapnik-$(UPVER)/scons/
-	@rm mapnik-$(UPVER)/deps/agg/include/agg_conv_gpc.h
 	@rm mapnik-$(UPVER)/tests/data/fonts/DejaVuSansMono-BoldOblique.ttf
 	@rm mapnik-$(UPVER)/tests/data/fonts/XB\ Zar.ttf
 	@rm mapnik-$(UPVER)/tests/data/fonts/LICENCE.txt

-- 
C++/Python toolkit for developing GIS applications



More information about the Pkg-grass-devel mailing list