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

[David Paleino]

The following commit has been merged in the master branch:
commit 4668ea5448eabc431829b5656aca1f4dfbcb735b
Author: David Paleino <dapal at debian.org>
Date:   Sun May 20 08:49:36 2012 +0200

    Switch debian/watch to github tags

diff --git a/debian/changelog b/debian/changelog
index 587e179..2b9c52b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapnik (2.0.0+ds1-4) UNRELEASED; urgency=low
+
+  * Switch debian/watch to github tags
+
+ -- David Paleino <dapal at debian.org>  Sun, 20 May 2012 08:49:20 +0200
+
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 
   * Fix wrong linkage against boost_python-py2*
diff --git a/debian/rules b/debian/rules
index ccaf804..e5d54c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,9 +88,9 @@ 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-$(UPVER)/fonts/dejavu*
-	@rm -rf mapnik-$(UPVER)/scons/
-	@rm -rf mapnik-$(UPVER)/tinyxml/
-	tar cf $(TARNAME) mapnik-$(UPVER)/
+	@rm -rf mapnik-mapnik-*/fonts/dejavu*
+	@rm -rf mapnik-mapnik-*/scons/
+	@rm -rf mapnik-mapnik-*/tinyxml/
+	tar cf $(TARNAME) mapnik-mapnik-*/
 	gzip -9 $(TARNAME)
-	rm -rf mapnik-$(UPVER)/
+	rm -rf mapnik-mapnik-*/
diff --git a/debian/watch b/debian/watch
index 20d457f..fac07da 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+ds\d// \
-http://download.berlios.de/mapnik/mapnik-(\d+.*)\.tar\.gz
+http://githubredir.debian.net/github/mapnik/mapnik/v(\d+.*)\.tar\.gz

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