[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-6-1-g439c2a0

[David Paleino]

The following commit has been merged in the master branch:
commit 439c2a06519de4fee5f59db80010116ad339aac9
Author: David Paleino <dapal at debian.org>
Date:   Thu Dec 1 18:05:01 2011 +0100

    Fix debian/watch and debian/rules' get-orig-source to point to github

diff --git a/debian/changelog b/debian/changelog
index bf6556d..85317cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmosis (0.39+ds1-7) UNRELEASED; urgency=low
+
+  * Fix debian/watch and debian/rules' get-orig-source to point to github
+
+ -- David Paleino <dapal at debian.org>  Thu, 01 Dec 2011 18:10:14 +0100
+
 osmosis (0.39+ds1-6) unstable; urgency=low
 
   * Fix plexus config file to correctly point to jars (Closes: #647452)
diff --git a/debian/rules b/debian/rules
index c452242..6f5d7d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,10 +27,7 @@ DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP := xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 
 CURVER  := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2 | cut -d- -f1 | cut -d+ -f1)
-SVNBASE := http://svn.openstreetmap.org/applications/utils/osmosis/tags
-SVNREPO := ${SVNBASE}/${CURVER}
-DESTDIR := ../tarballs/osmosis-${CURVER}
-DESTTGZ := ../tarballs/osmosis_${CURVER}+ds1.orig.tar.gz
+DESTTGZ := osmosis_${CURVER}+ds1.orig.tar.gz
 
 debian/osmosis.1: debian/osmosis.xml
 	$(XP) -o $@ $(DB2MAN) $<
@@ -52,11 +49,15 @@ override_dh_installchangelogs:
 get-orig-source:
 	dh_testdir
 	test -d ../tarballs/. || mkdir -p ../tarballs
-	@echo Downloading osmosis from ${SVNREPO}
-	svn export ${SVNREPO} ${DESTDIR}
+	uscan --verbose \
+		--download-version $(CURVER) \
+		--destdir . \
+		--force-download \
+		--rename
+	tar xf osmosis_$(CURVER).orig.tar.gz
 	@echo Removing build-support/repo and debian directory
-	rm -rf ${DESTDIR}/build-support/repo ${DESTDIR}/debian
-	@echo Building snapshot tarball																	
-	tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
+	rm -rf openstreetmap-osmosis-*/build-support/repo openstreetmap-osmosis-*/debian
+	@echo Building snapshot tarball
+	tar czf ${DESTTGZ} openstreetmap-osmosis-*/
 	@echo Cleaning up
-	rm -rf ${DESTDIR}
+	rm -rf openstreetmap-osmosis-*/ osmosis_$(CURVER).orig.tar.gz
diff --git a/debian/watch b/debian/watch
index 2b7469d..5206df5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds\d+$//,uversionmangle=s/\.tar\.gz//;s/\.tgz// \
-http://bretth.dev.openstreetmap.org/osmosis-build/osmosis-([.0-9]*)\.(tar\.gz|tgz)
+opts=dversionmangle=s/\+ds\d+$// \
+http://githubredir.debian.net/github/openstreetmap/osmosis/(\d+.*)\.tar\.gz

-- 
Osmosis, an OSM data processor