[rbdoom3bfg] 01/07: Fix git-get-orig rule: Did not pull the requested date, but always the newest version

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit f545ecfad4fd4bbd4af5da22d05a07e2b5f8c0a7
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sun Sep 13 22:14:27 2015 +0200

    Fix git-get-orig rule: Did not pull the requested date, but always the newest version
---
 debian/changelog | 7 +++++++
 debian/rules     | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f01d29..4029095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rbdoom3bfg (1.0.3+repack1+git20150625-2) UNRELEASED; urgency=medium
+
+  * Fix git-get-orig rule: Did not pull the requested date, but always
+    the newest version
+
+ -- Tobias Frost <tobi at debian.org>  Sun, 13 Sep 2015 22:14:13 +0200
+
 rbdoom3bfg (1.0.3+repack1+git20150625-1) unstable; urgency=medium
 
   * New uptream git snapshot.
diff --git a/debian/rules b/debian/rules
index b108c12..f501d91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,16 +46,16 @@ UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d+ -f1
 ## from: https://wiki.debian.org/onlyjob/get-orig-source
 .PHONY: get-orig-source
 get-orig-source: $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz
-	#$(info I: $(UPSVER$)~$(PKG)_$(VER)$(DTYPE))
+	#$(info I: $(UPSVER$)+$(PKG)_$(VER)$(DTYPE))
 	@
 
 UDATE = $(shell date --rfc-3339=seconds --date='TZ="UTC" \
-	$(shell echo +git$(VER) | perl -ne 'print "$$1-$$2-$$3" if m/\~(?:git|svn|hg)(\d{4})(\d{2})(\d{2})/')')
+	$(shell echo +git$(VER) | perl -ne 'print "$$1-$$2-$$3" if m/\+(?:git|svn|hg)(\d{4})(\d{2})(\d{2})/')')
 
 $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz:
 	@echo DEBUG: VER=$(VER) UDATE=$(UDATE) UPSVER=$(UPSVER)
 	@echo "$(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz"
-	@echo $(VER) | grep '^[0-9]*$$' || ( echo Cannot find timestamp in package version. Please specify VER, see README.source. Aborting.. ; exit 1 )
+	@echo $(VER) | grep -q '^[0-9]*$$' || ( echo Cannot find timestamp in package version. Please specify VER, see README.source. Aborting.. ; exit 1 )
 	#$(info I: UDATE=$(UDATE))
 	$(if $(wildcard $(PKG)-$(UPSVER)+git$(VER)),$(error $(PKG)-$(UPSVER)+git$(VER) exist, aborting..))
 	@echo "# Downloading..."
@@ -69,7 +69,7 @@ $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz:
 	&& echo "# Setting times..." \
 	&& for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
 	&& echo "# Cleaning-up..." \
-	&& $(RM) -r -v $$(awk 'BEGIN{RS=ORS="\n\n";FS=OFS="\n"}/Files-Excluded:/' $(PKD)/copyright | sed s/Files-Excluded://) \
+	&& $(RM) -r -v $$(awk 'BEGIN{RS=ORS="\n\n";FS=OFS="\n"}/Files-Excluded:/' $(PKD)/copyright | sed -n -e '/^Files-Excluded:/,$${p}' | sed s/Files-Excluded://) \
 	&& $(RM) -r .git .git*
 	@echo "# Packing..."
 	find -L "$(PKG)-$(UPSVER)+git$(VER)" -xdev -type f -print | sort \

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