diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/replace-texi2html-with-makeinfo | 17 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/texi2html-conf-source-dir-vs-build-dir | 35 |
3 files changed, 54 insertions, 0 deletions
diff --git a/debian/patches/replace-texi2html-with-makeinfo b/debian/patches/replace-texi2html-with-makeinfo new file mode 100644 index 000000000..56a6bf4f2 --- /dev/null +++ b/debian/patches/replace-texi2html-with-makeinfo @@ -0,0 +1,17 @@ +Description: Replace deprecated texi2html with makeinfo +Forwarded: http://www.zsh.org/mla/workers/2013/msg00723.html +Author: Axel Beckert <abe@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 $(sdir)/texi2html.conf + + .SUFFIXES: .yo .1 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..350a48b39 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..5f6486295 --- /dev/null +++ b/debian/patches/texi2html-conf-source-dir-vs-build-dir @@ -0,0 +1,35 @@ +Description: Fixes source vs build directory mixup +Forwarded: http://www.zsh.org/mla/workers/2014/msg00763.html +Author: Axel Beckert <abe@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) + ( \ |