[Pkg-zsh-commits] [zsh] 02/03: Drop all but one patch (issues fixed upstream)

[Axel Beckert]

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

abe pushed a commit to branch debian
in repository zsh.

commit 640212e70f50be20fca1d3a58f3e4e7ce77ac7a2
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu May 28 02:41:59 2015 +0200

    Drop all but one patch (issues fixed upstream)
---
 ...uite-failures-related-to-setopt-PROMPT_SP.patch | 41 ----------------------
 debian/patches/replace-texi2html-with-makeinfo     | 17 ---------
 debian/patches/series                              |  2 --
 3 files changed, 60 deletions(-)

diff --git a/debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch b/debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch
deleted file mode 100644
index f289d4a..0000000
--- a/debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix test suite failures related to "setopt PROMPT_SP"
-Author: Peter Stephenson <p.stephenson at samsung.com>
-Bug: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=35042
-Origin: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=35056
-
-diff --git a/Test/A02alias.ztst b/Test/A02alias.ztst
-index 08163eb..cace2a4 100644
---- a/Test/A02alias.ztst
-+++ b/Test/A02alias.ztst
-@@ -59,7 +59,8 @@
- >And aliases are expanded
- 
-   $ZTST_testdir/../Src/zsh -fis <<<'
--  PROMPT=""
-+  unsetopt PROMPT_SP
-+  PROMPT="" PS2="" PS3="" PS4="" RPS1="" RPS2=""
-   exec 2>&1
-   alias \{=echo
-   { begin
-@@ -68,16 +69,17 @@
- 0:Aliasing reserved tokens
- >begin
- >end
--*>*4*{ begin
--*>*5*{end
-+*>*5*{ begin
-+*>*6*{end
- 
-   $ZTST_testdir/../Src/zsh -fis <<<'
--  PROMPT=""
-+  unsetopt PROMPT_SP
-+  PROMPT="" PS2="" PS3="" PS4="" RPS1="" RPS2=""
-   exec 2>&1
-   alias -g S=\"
-   echo S a string S "
-   fc -l -1' 2>/dev/null
- 0:Global aliasing quotes
- > a string S 
--*>*4*echo S a string S "
-+*>*5*echo S a string S "
- # Note there is a trailing space on the "> a string S " line
diff --git a/debian/patches/replace-texi2html-with-makeinfo b/debian/patches/replace-texi2html-with-makeinfo
deleted file mode 100644
index 509a90a..0000000
--- a/debian/patches/replace-texi2html-with-makeinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Replace deprecated texi2html with makeinfo
-Forwarded: http://www.zsh.org/mla/workers/2013/msg00723.html
-Author: Axel Beckert <abe at debian.org>
-
-Index: zsh/Doc/Makefile.in
-===================================================================
---- zsh.orig/Doc/Makefile.in	2014-08-11 17:45:12.000000000 +0200
-+++ zsh/Doc/Makefile.in	2014-08-11 17:45:12.000000000 +0200
-@@ -41,7 +41,7 @@
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- DVIPS = dvips
--TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \
-+TEXI2HTML = makeinfo --html --output . --ifinfo --split=chapter --node-files \
-             --init-file texi2html.conf
- 
- .SUFFIXES: .yo .1
diff --git a/debian/patches/series b/debian/patches/series
index 4342eda..857f0f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-replace-texi2html-with-makeinfo
 further-mitigate-test-suite-hangs.patch
-fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git