[Pkg-zsh-commits] [zsh-syntax-highlighting] 06/07: d/rules: _origtar: Handle release candidate version numbers.

[Daniel Shahaf]

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

danielsh-guest pushed a commit to branch debian/master
in repository zsh-syntax-highlighting.

commit e2f7b690ce4c41ad591204326f17d373b65da4a4
Author: Daniel Shahaf <d.s at daniel.shahaf.name>
Date:   Mon Jul 31 19:02:57 2017 +0000

    d/rules: _origtar: Handle release candidate version numbers.
    
    Bifurcate the variable $(version) into $(debian_version) and $(upstream_tag).
    
    (cherry picked from commit 25f60a29021811223561abdda4df081667b95870)
---
 debian/rules | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1188c99..4d6f8f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,11 @@ override_dh_installchangelogs:
 %:
 	dh $@
 
-_origtar: version=$(shell dpkg-parsechangelog -SVersion | sed 's/-[^-]*$$//')
+# The upstream version may be '0.6.0-rc1', in which case the debian version is
+# '0.6.0~rc1', and the debian tag 'debian/0.6.0_rc1-1' per DEP-14.
+_origtar: debian_version=$(shell dpkg-parsechangelog -SVersion | sed 's/-[^-]*$$//')
+_origtar: upstream_tag=$(shell dpkg-parsechangelog -SVersion | sed -e 's/-[^-]*$$//' -e 's/[~]/-/')
 _origtar:
-	git tag --verify $(version)
-	git archive --format=tar --output=../zsh-syntax-highlighting_$(version).orig.tar --prefix=zsh-syntax-highlighting-$(version)/ $(version)
-	xz -7v ../zsh-syntax-highlighting_$(version).orig.tar
+	git tag --verify $(upstream_tag)
+	git archive --format=tar --output=../zsh-syntax-highlighting_$(debian_version).orig.tar --prefix=zsh-syntax-highlighting-$(debian_version)/ $(upstream_tag)
+	xz -7v ../zsh-syntax-highlighting_$(debian_version).orig.tar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-zsh/zsh-syntax-highlighting.git