[freeorion] 01/10: Update get-orig-source target for tarball releases.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freeorion.

commit 23f0e499c815a4e8793df062e0522e1731be8a4d
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jul 30 22:55:16 2015 +0200

    Update get-orig-source target for tarball releases.
    
    Add get-git-snapshot target to fetch git snapshots easily.
---
 debian/rules | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 057464b..21e1cf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@ VER := $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d- -f1)
 WEAK_HOSTS := armel armhf mips mipsel sparc
 UURL := https://github.com/freeorion/freeorion.git
 PKG := freeorion
-COMMIT := cab4aa243552328e71de55f45bc11fc189930494
-REV := $(shell echo $(COMMIT) | cut -c1-8)
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(WEAK_HOSTS)))
 	MAX  := 1
@@ -49,9 +47,12 @@ override_dh_install:
 override_dh_python2:
 	dh_python2 -pfreeorion-data /usr/share/games
 
-.PHONY: get-orig-source
+get-orig-source:
+	uscan --download-current-version --force-download --no-symlink
+
+.PHONY: get-git-snapshot
 ## http://wiki.debian.org/onlyjob/get-orig-source
-get-orig-source: $(PKG)_$(VER).orig.tar.xz
+get-git-snapshot: $(PKG)_$(VER).orig.tar.xz
 	@
 
 $(PKG)_$(VER).orig.tar.xz:
@@ -59,16 +60,15 @@ $(PKG)_$(VER).orig.tar.xz:
 	git clone $(UURL) $(PKG)-$(VER)
 	@echo "# Clean-up..."
 	cd $(PKG)-$(VER) \
-	&& git checkout -b debiansource $(COMMIT) \
 	&& for F in $$(git ls-tree -r --name-only HEAD); \
 	do touch --no-dereference -d "$$(git log -1 --format="%ai" -- "$$F")" "$$F"; done \
 	&& $(RM) -r -v \
 		msvc2010 \
+		msvc2013 \
 		Xcode \
 		Installer \
 		default/*.ttf \
-		.git/ \
-	&& sed -i 's:FreeOrion_WC_REVISION ???:FreeOrion_WC_REVISION $(REV):' CMakeLists.txt
+		.git/
 	@echo "# Packing..."
 	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
 	| XZ_OPT="-6v" tar -caf "$(PKG)_$(VER).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \

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