[Pkg-zsh-commits] [zsh-syntax-highlighting] 01/01: Release 0.5.0-2; fixes test suite failure on zsh>=5.4~.

[Daniel Shahaf]

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

danielsh-guest pushed a commit to annotated tag debian/0.5.0-2
in repository zsh-syntax-highlighting.

commit d7450f424bb79f461f478ad88a716cd9257ff3fc
Author: Daniel Shahaf <danielsh at apache.org>
Date:   Wed Aug 16 01:31:47 2017 +0000

    Release 0.5.0-2; fixes test suite failure on zsh>=5.4~.
---
 debian/changelog                                   |  7 +++++++
 debian/patches/series                              |  1 +
 ....4-to-be-compatibility-Set-a-new-I-am-sho.patch | 24 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 82c4ecd..53f294c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zsh-syntax-highlighting (0.5.0-2) unstable; urgency=low
+
+  * Cherry-pick upstream commit 9523d6d49cb3d4db5bd84c3cec6168a2057fe3ab
+    to fix a test suite error on zsh>=5.4~.  (Closes: #872017)
+
+ -- Daniel Shahaf <danielsh at apache.org>  Wed, 16 Aug 2017 01:28:29 +0000
+
 zsh-syntax-highlighting (0.5.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index 986d384..9f85427 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 set-version.patch
 fix-test-failures-due-to-ps.patch
+tests-zsh-5.4-to-be-compatibility-Set-a-new-I-am-sho.patch
diff --git a/debian/patches/tests-zsh-5.4-to-be-compatibility-Set-a-new-I-am-sho.patch b/debian/patches/tests-zsh-5.4-to-be-compatibility-Set-a-new-I-am-sho.patch
new file mode 100644
index 0000000..6abfddd
--- /dev/null
+++ b/debian/patches/tests-zsh-5.4-to-be-compatibility-Set-a-new-I-am-sho.patch
@@ -0,0 +1,24 @@
+From 9523d6d49cb3d4db5bd84c3cec6168a2057fe3ab Mon Sep 17 00:00:00 2001
+From: Daniel Shahaf <d.s at daniel.shahaf.name>
+Date: Wed, 25 Jan 2017 19:35:34 +0000
+Subject: [PATCH] tests: zsh 5.4-to-be compatibility: Set a new "I am shooting
+ myself in the foot" option.
+
+---
+ highlighters/main/test-data/alias.zsh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/highlighters/main/test-data/alias.zsh b/highlighters/main/test-data/alias.zsh
+index 5129614..2977343 100644
+--- a/highlighters/main/test-data/alias.zsh
++++ b/highlighters/main/test-data/alias.zsh
+@@ -29,6 +29,9 @@
+ 
+ alias alias1="unused expansion"
+ alias -s alias2="echo"
++if set -o | grep -q aliasfuncdef; then
++  setopt alias_func_def # 5.4+
++fi
+ alias1() {} # to check that it's highlighted as an alias, not as a function
+ 
+ BUFFER='x.alias2; alias1'

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