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

[David Paleino]

The following commit has been merged in the master branch:
commit fe59f45d6ceaa1be7a45c6992f607108a323577e
Author: David Paleino <dapal at debian.org>
Date:   Sun Apr 21 10:27:29 2013 +0200

    Adapt debian/rules get-orig-source target to new upstream layout

diff --git a/debian/changelog b/debian/changelog
index 41990ad..8697f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low
     - 03-fix_ImportError_mips.patc, 03-fix_big-endian.patch and
       04-port_to_new_boost.patch removed
   * Python bindings testsuite temporarily disabled
+  * Adapt debian/rules get-orig-source target to new upstream layout
 
- -- David Paleino <dapal at debian.org>  Fri, 25 May 2012 19:00:10 +0200
+ -- David Paleino <dapal at debian.org>  Sun, 21 Apr 2013 10:27:11 +0200
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 82e9dcb..31573ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,9 +91,8 @@ get-orig-source:
 	tar xvf mapnik_$(UPVER).orig.tar.gz
 	@rm -vrf mapnik_$(UPVER).orig.tar.gz
 	@echo Removing third-party sources from orig.tar.gz
-	@rm -rf mapnik-mapnik-*/fonts/dejavu*
-	@rm -rf mapnik-mapnik-*/scons/
-	@rm -rf mapnik-mapnik-*/tinyxml/
-	tar cf $(TARNAME) mapnik-mapnik-*/
+	@rm -rf mapnik-$(UPVER)/fonts/dejavu*
+	@rm -rf mapnik-$(UPVER)/scons/
+	tar cf $(TARNAME) mapnik-$(UPVER)/
 	gzip -9 $(TARNAME)
-	rm -rf mapnik-mapnik-*/
+	rm -rf mapnik-$(UPVER)/

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