[Pkg-zsh-commits] [zsh] 02/03: Refresh replace-texi2html-with-makeinfo, drop texi2html-conf-source-dir-vs-build-dir

[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 baa705dbd0f6f722f070948da1587f77e5b1767c
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Aug 12 23:04:51 2014 +0200

    Refresh replace-texi2html-with-makeinfo, drop texi2html-conf-source-dir-vs-build-dir
    
    … and bump upstream version in preliminary changelog entry.
---
 debian/changelog                                   |  2 +-
 debian/patches/replace-texi2html-with-makeinfo     |  2 +-
 debian/patches/series                              |  1 -
 .../patches/texi2html-conf-source-dir-vs-build-dir | 35 ----------------------
 4 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8c551f..ce7048d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-zsh (5.0.5-dev-1-1) UNRELEASED; urgency=medium
+zsh (5.0.5-dev-2-1) UNRELEASED; urgency=medium
 
   * New upstream pre-release
     + TODO: Go through all fixed-upstream tagged bugs.
diff --git a/debian/patches/replace-texi2html-with-makeinfo b/debian/patches/replace-texi2html-with-makeinfo
index 56a6bf4..509a90a 100644
--- a/debian/patches/replace-texi2html-with-makeinfo
+++ b/debian/patches/replace-texi2html-with-makeinfo
@@ -12,6 +12,6 @@ Index: zsh/Doc/Makefile.in
  DVIPS = dvips
 -TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \
 +TEXI2HTML = makeinfo --html --output . --ifinfo --split=chapter --node-files \
-             --init-file $(sdir)/texi2html.conf
+             --init-file texi2html.conf
  
  .SUFFIXES: .yo .1
diff --git a/debian/patches/series b/debian/patches/series
index 350a48b..8d7c832 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 replace-texi2html-with-makeinfo
-texi2html-conf-source-dir-vs-build-dir
diff --git a/debian/patches/texi2html-conf-source-dir-vs-build-dir b/debian/patches/texi2html-conf-source-dir-vs-build-dir
deleted file mode 100644
index 5f64862..0000000
--- a/debian/patches/texi2html-conf-source-dir-vs-build-dir
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fixes source vs build directory mixup
-Forwarded: http://www.zsh.org/mla/workers/2014/msg00763.html
-Author: Axel Beckert <abe at debian.org>
-
-Index: zsh/Doc/Makefile.in
-===================================================================
---- zsh.orig/Doc/Makefile.in	2014-08-11 20:33:31.000000000 +0200
-+++ zsh/Doc/Makefile.in	2014-08-11 20:40:02.000000000 +0200
-@@ -42,7 +42,7 @@
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- TEXI2HTML = makeinfo --html --output . --ifinfo --split=chapter --node-files \
--            --init-file $(sdir)/texi2html.conf
-+            --init-file texi2html.conf
- 
- .SUFFIXES: .yo .1
- 
-@@ -160,7 +160,7 @@
- html: zsh_toc.html
- .PHONY: html
- 
--zsh_toc.html: $(sdir)/zsh.texi $(sdir)/texi2html.conf
-+zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
- 	$(TEXI2HTML) $(sdir)/zsh.texi
- 
- zshall.1: zsh.yo
-@@ -251,7 +251,7 @@
- 
- texi2html.conf: $(sdir_top)/Config/version.mk
- 	echo '$$PRE_BODY_CLOSE = "<font size=\"-1\">Zsh version $(VERSION), released on $(VERSION_DATE).</font>";' \
--	    > $(sdir)/$@
-+	    > $@
- 
- Zsh/modlist.yo: $(MODDOCSRC)
- 	( \

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