[texinfo] 01/01: fix unprotected ~ in second pass (Closes: #822492)
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texinfo.
commit 89b761eaf8feca59a9a40e9ee32fa3e809c7e8a6
Author: Norbert Preining <preining@debian.org>
Date: Tue Apr 26 08:25:15 2016 +0900
fix unprotected ~ in second pass (Closes: #822492)
---
debian/changelog | 6 ++++++
debian/patches/series | 1 +
debian/patches/upstream-fix-catcode | 18 ++++++++++++++++++
3 files changed, 25 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e41e32e..4ef4464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+texinfo (6.1.0.dfsg.1-7) UNRELEASED; urgency=medium
+
+ * fix unprotected ~ in second pass (Closes: #822492)
+
+ -- Norbert Preining <preining@debian.org> Tue, 26 Apr 2016 08:25:07 +0900
+
texinfo (6.1.0.dfsg.1-6) unstable; urgency=medium
* fix TeX macro expansion in index entries (see bug #815205)
diff --git a/debian/patches/series b/debian/patches/series
index c09f2b4..d161062 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ upstream-svn7031-texi2dvi-fix
upstream-svn7032-info-match-nocase
upstream-svn7041-fix-single-arg-macros
fix-index
+upstream-fix-catcode
diff --git a/debian/patches/upstream-fix-catcode b/debian/patches/upstream-fix-catcode
new file mode 100644
index 0000000..78529b2
--- /dev/null
+++ b/debian/patches/upstream-fix-catcode
@@ -0,0 +1,18 @@
+fix unprotected ~ in second pass (Closes: #822492)
+
+patch by Ted Ts'o, applied upstream
+---
+ util/texi2dvi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
+@@ -812,7 +812,7 @@
+
+ # do the special catcode trick for ~ in filenames only for Texinfo,
+ # not LaTeX.
+- if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
++ if test x"$in_lang" = xtexinfo && test $catcode_special != false ; then
+ catcode_special=true
+ else
+ catcode_special=false
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git
Reply to: