[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
Jérémy Lal
kapouer at melix.org
Sun Aug 11 16:00:51 UTC 2013
The following commit has been merged in the master branch:
commit 1887582b5403720270dc4039a3f73bf992a33c52
Author: Jérémy Lal <kapouer at melix.org>
Date: Sun Aug 11 17:47:42 2013 +0200
Fix get-orig-source
diff --git a/debian/rules b/debian/rules
index c65a15b..b93bd00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,28 +81,28 @@ override_dh_auto_test:
--with python2
get-orig-source:
- mkdir -p ../tarballs && uscan \
+ mkdir -p ../tarballs
+ uscan \
--verbose \
--force-download \
--download-version $(UPVER) \
--rename \
--destdir ../tarballs
-
tar xvf ../tarballs/mapnik_$(UPVER).orig.tar.gz
@echo Removing third-party sources from orig.tar.gz
@rm -r mapnik-$(UPVER)/fonts/dejavu*
@rm mapnik-$(UPVER)/fonts/unifont*
@rm -r mapnik-$(UPVER)/scons/
- @rm deps/agg/include/agg_conv_gpc.h
- @rm tests/data/fonts/DejaVuSansMono-BoldOblique.ttf
- @rm tests/data/fonts/XB\ Zar.ttf
- @rm tests/data/fonts/LICENCE.txt
- @rm tests/data/csv/10m-land.csv
- @rm tests/data/raster/*
- @rm tests/data/shp/ne_110m*
- @rm tests/data/shp/world_merc*
- @rm tests/data/shp/new_zealand/ne_50m*
+ @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
+ @rm mapnik-$(UPVER)/tests/data/csv/10m-land.csv
+ @rm mapnik-$(UPVER)/tests/data/raster/*
+ @rm mapnik-$(UPVER)/tests/data/shp/ne_110m*
+ @rm mapnik-$(UPVER)/tests/data/shp/world_merc*
+ @rm mapnik-$(UPVER)/tests/data/shp/new_zealand/ne_50m*
tar cf $(TARNAME) mapnik-$(UPVER)/
- gzip -9 $(TARNAME)
rm -rf mapnik-$(UPVER)/
- mv $(TARNAME) ../tarballs/$(TARNAME)
+ gzip -9 $(TARNAME)
+ mv $(TARNAME).gz ../tarballs/
--
C++/Python toolkit for developing GIS applications
More information about the Pkg-grass-devel
mailing list