[Pkg-zsh-commits] [zsh-syntax-highlighting] 05/06: d/patches/set-version.patch: Fix $ZSH_HIGHLIGHT_REVISION in release candidates (rc) builds

[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 b3bf948b678415bd9e982c7c2ac60c14a037ea06
Author: Daniel Shahaf <d.s at daniel.shahaf.name>
Date:   Tue Aug 1 00:25:58 2017 +0000

    d/patches/set-version.patch: Fix $ZSH_HIGHLIGHT_REVISION in release candidates (rc) builds
    
    Before: "debian/0.6.0~rc1-2"
    After:  "debian/0.6.0_rc1-2"
---
 debian/patches/set-version.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/patches/set-version.patch b/debian/patches/set-version.patch
index 3c40002..ca47e93 100644
--- a/debian/patches/set-version.patch
+++ b/debian/patches/set-version.patch
@@ -17,11 +17,13 @@ rather than upstream's).
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,14 @@
+@@ -1,5 +1,16 @@
  NAME=zsh-syntax-highlighting
  
 +include /usr/share/dpkg/pkg-info.mk
 +
++# Munge $(DEB_VERSION) in accordance with DEP-14.
++DEB_VERSION_FOR_GIT_TAGS=$(shell printf %s "$(DEB_VERSION)" | tr \~ _)
 +DPKG_VENDOR=$(shell dpkg-vendor --query vendor | env LC_ALL=C tr A-Z a-z | env LC_ALL=C tr -d -c '[:alnum:]')
 +ifeq "$(shell dpkg-parsechangelog -SDistribution)" "UNRELEASED"
 +DOTVERSION_SUFFIX="+unreleased"
@@ -32,7 +34,7 @@ rather than upstream's).
  INSTALL?=install -c
  PREFIX?=/usr/local
  SHARE_DIR?=$(DESTDIR)$(PREFIX)/share/$(NAME)
-@@ -17,11 +26,20 @@
+@@ -17,11 +28,20 @@
  	$(INSTALL) -d $(DOC_DIR)
  	cp .version zsh-syntax-highlighting.zsh $(SHARE_DIR)
  	cp COPYING.md README.md changelog.md $(DOC_DIR)
@@ -52,7 +54,7 @@ rather than upstream's).
 +# but also means the code we are building has been tagged.  That allows us
 +# to set .revision-hash to a valid gitrevisions(7) expression: we set it to
 +# "debian/0.3.0-1", the tag name of the release we are building.
-+	printf "%s/%s\n" "$(DPKG_VENDOR)" "$(DEB_VERSION)" \
++	printf "%s/%s\n" "$(DPKG_VENDOR)" "$(DEB_VERSION_FOR_GIT_TAGS)" \
 +		> $(SHARE_DIR)/.revision-hash
 +endif
  	:

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