[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-32-g55a0e32

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 55a0e3229c5120ac15da14185215b94cfe1d2dec
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Tue Nov 29 19:15:55 2011 -0500

    use uscan --force-download

diff --git a/debian/changelog b/debian/changelog
index 17a6d13..e0d03d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 minetest (0.3.1+dfsg-2) unstable; urgency=low
 
   * Fix freedesktop menu "Type" entry.
+  * Use "uscan --force-download" in get-orig-source rule.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Tue, 29 Nov 2011 18:42:07 -0500
 
diff --git a/debian/rules b/debian/rules
index a42ee44..210ffbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,14 +69,15 @@ override_dh_strip:
 	dh_strip --dbg-package=minetest-dbg
 
 get-orig-source:
-	uscan && mv ../${version} ../minetest_${version}.orig.tar.gz || true
+	uscan --force-download && mv ../${version} ${tmpdir} || true
 	cd ${tmpdir} && \
-	    tar xf ${wrkdir}/../minetest_${version}.orig.tar.gz && \
+	    tar xf ${version} && rm -f ${version} && \
 	    for file in ${dfsgremovals}; do \
 	        find . -name $$file -execdir rm -rf {} \; 2>/dev/null || true; \
 		done && \
 	    tar czf ${wrkdir}/../minetest_${version}+dfsg.orig.tar.gz *
 	rm -rf ${tmpdir}
+	@echo "successfully created new tarball: ../minetest_${version}+dfsg.orig.tar.gz"
 
 %:
 	dh ${@} 

-- 
InfiniMiner/Minecraft-inspired open game world