[astromenace-data] 03/04: Update get-orig-source in debian/rules: - always download latest version of program - rename root directory for specifying program version

[Boris Pek]

This is an automated email from the git hooks/post-receive script.

tehnick pushed a commit to branch master
in repository astromenace-data.

commit 39f7f709cbfb0fcc2bcc42668a1671cf3635af34
Author: Boris Pek <tehnick-8 at yandex.ru>
Date:   Thu Dec 19 10:29:19 2013 +0400

    Update get-orig-source in debian/rules:
    - always download latest version of program
    - rename root directory for specifying program version
---
 debian/rules | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index d3e982c..c1a903e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,14 +15,16 @@ override_dh_installchangelogs:
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-DPATH := $(abspath $(dir $(MAKEFILE_LIST)))
-VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}')
+DEBIAN_PATH := $(abspath $(dir $(MAKEFILE_LIST)))
+USCAN_REPORT = $(shell uscan --noconf --report --dehs $(DEBIAN_PATH))
+CUR_VER = $(shell echo "$(USCAN_REPORT)" | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
+CUR_URL = $(shell echo "$(USCAN_REPORT)" | sed -n 's/.*<upstream-url>\(.*\)<\/upstream-url>.*/\1/p')
 .PHONY: get-orig-source
 get-orig-source:
-	@echo "# Downloading..."
-	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(DPATH)
-	tar xjf "astromenace_$(VER).orig.tar.bz2"
+	wget -c "$(CUR_URL)" -O "astromenace_$(CUR_VER).orig.tar.bz2"
+	tar xjf "astromenace_$(CUR_VER).orig.tar.bz2"
 	rm -r "AstroMenace/RAW_VFS_DATA/FONT" "AstroMenace/AstroMenaceSource"
 	rm "AstroMenace/MacOSX.zip" "AstroMenace/CMakeLists.txt" "AstroMenace/CodeBlocks.cbp"
-	tar -cJf "astromenace-data_$(VER)+repack.orig.tar.xz" "AstroMenace"
-	rm -r "AstroMenace" "astromenace_$(VER).orig.tar.bz2"
+	mv "AstroMenace" "astromenace-data-$(CUR_VER)+repack"
+	tar -cJf "astromenace-data_$(CUR_VER)+repack.orig.tar.xz" "astromenace-data-$(CUR_VER)+repack"
+	rm -r "astromenace-data-$(CUR_VER)+repack" "astromenace_$(CUR_VER).orig.tar.bz2"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/astromenace-data.git