[SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-13-g25413a6
The following commit has been merged in the master branch:
commit 464a5a9148d81106f44ab2114b01ebc141420ccb
Author: Norbert Preining <preining@logic.at>
Date: Mon Nov 19 09:27:56 2012 +0900
update and cleanup patches for new release
diff --git a/debian/patches/check-nodes-boundaries b/debian/patches/check-nodes-boundaries
deleted file mode 100644
index d78d7fe..0000000
--- a/debian/patches/check-nodes-boundaries
+++ /dev/null
@@ -1,22 +0,0 @@
-patch for fixing #598932, a segfault under certain circumstances due to
-wrong node computation if the .info file is malformed.
-The patch is based on the one checked in to texinfo cvs by
-Sergey Poznyakoff
----
- info/nodes.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-Index: texinfo-4.13a.dfsg.1/info/nodes.c
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/info/nodes.c 2010-10-08 10:00:22.000000000 +0900
-+++ texinfo-4.13a.dfsg.1/info/nodes.c 2010-10-08 10:13:25.000000000 +0900
-@@ -960,6 +960,9 @@
- /* If we were able to find this file and load it, then return
- the node within it. */
- {
-+ if (!(tag->nodestart >= 0 && tag->nodestart < subfile->filesize))
-+ return NULL;
-+
- NODE *node = xmalloc (sizeof (NODE));
- node->filename = subfile->fullpath;
- node->parent = NULL;
diff --git a/debian/patches/dont_build_info b/debian/patches/dont_build_info
index b6fda5f..47f9e48 100644
--- a/debian/patches/dont_build_info
+++ b/debian/patches/dont_build_info
@@ -1,17 +1,12 @@
-70_dont_build_info.dpatch by Norbert Preining
-
dont build the info documentation, it has been removed
-
---
doc/Makefile.in | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
-Index: texinfo-4.13a.dfsg.1/doc/Makefile.in
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/doc/Makefile.in 2008-09-18 20:46:24.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/doc/Makefile.in 2009-03-09 15:17:15.000000000 +0100
-@@ -121,14 +121,16 @@
- CONFIG_CLEAN_FILES =
+--- texinfo.orig/doc/Makefile.in
++++ texinfo/doc/Makefile.in
+@@ -162,14 +162,16 @@
+ CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
-INFO_DEPS = texinfo info-stnd.info info.info
@@ -29,16 +24,16 @@ Index: texinfo-4.13a.dfsg.1/doc/Makefile.in
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
-@@ -435,8 +437,10 @@
- top_srcdir = @top_srcdir@
+@@ -911,8 +913,10 @@
+ SUBDIRS = tp_api
# Put texinfo.txi first because that's the most important.
-info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
-DISTCLEANFILES = texinfo texinfo-* info*.info*
+#info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
+#DISTCLEANFILES = texinfo texinfo-* info*.info*
-+info_TEXINFOS =
-+DISTCLEANFILES =
- man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \
- info.5 texinfo.5 texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
++info_TEXINFOS =
++DISTCLEANFILES =
+ # Use the programs built in our distribution, taking account of possible
+ # cross-compiling.
diff --git a/debian/patches/fix-direntry b/debian/patches/fix-direntry
deleted file mode 100644
index beacd3f..0000000
--- a/debian/patches/fix-direntry
+++ /dev/null
@@ -1,43 +0,0 @@
-patch taken from
-http://lists.gnu.org/archive/html/bug-texinfo/2007-10/msg00020.html
-(for cmds.c) and adjusted for insertion.c by Norbert Preining
----
- makeinfo/cmds.c | 10 +++++++---
- makeinfo/insertion.c | 2 +-
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-Index: texinfo-4.11.dfsg.1/makeinfo/cmds.c
-===================================================================
---- texinfo-4.11.dfsg.1.orig/makeinfo/cmds.c 2007-07-15 19:36:19.000000000 +0200
-+++ texinfo-4.11.dfsg.1/makeinfo/cmds.c 2007-12-19 16:19:24.000000000 +0100
-@@ -1637,10 +1637,14 @@
-
- if (!no_headers && !html)
- {
-+ /* use add_* instead of insert_* because otherwise the
-+ file header ("This is ...") will end up inside the
-+ dir section markers. */
- kill_self_indent (-1); /* make sure there's no indentation */
-- insert_string ("INFO-DIR-SECTION ");
-- insert_string (line);
-- insert ('\n');
-+ cm_noindent (); /* make sure again */
-+ add_word ("INFO-DIR-SECTION ");
-+ add_word (line);
-+ add_char ('\n');
- }
-
- free (line);
-Index: texinfo-4.11.dfsg.1/makeinfo/insertion.c
-===================================================================
---- texinfo-4.11.dfsg.1.orig/makeinfo/insertion.c 2007-12-19 16:19:35.000000000 +0100
-+++ texinfo-4.11.dfsg.1/makeinfo/insertion.c 2007-12-19 16:19:41.000000000 +0100
-@@ -488,7 +488,7 @@
- close_single_paragraph ();
- filling_enabled = no_indent = 0;
- inhibit_paragraph_indentation = 1;
-- insert_string ("START-INFO-DIR-ENTRY\n");
-+ add_word ("START-INFO-DIR-ENTRY\n");
- break;
-
- case documentdescription:
diff --git a/debian/patches/fix-texi2dvi-bashism b/debian/patches/fix-texi2dvi-bashism
deleted file mode 100644
index 5ad67ac..0000000
--- a/debian/patches/fix-texi2dvi-bashism
+++ /dev/null
@@ -1,17 +0,0 @@
----
- util/texi2dvi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: texinfo-4.12.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.12.dfsg.1.orig/util/texi2dvi 2008-06-13 09:28:00.000000000 +0200
-+++ texinfo-4.12.dfsg.1/util/texi2dvi 2008-06-13 09:36:34.000000000 +0200
-@@ -1105,7 +1105,7 @@
- # main info output, the user asked to run TeX, not makeinfo.
- run_makeinfo ()
- {
-- test $in_lang == texinfo ||
-+ test $in_lang = texinfo ||
- return 0
-
- # Unless required by the user, makeinfo expansion is wanted only
diff --git a/debian/patches/info_core_dump_small_window b/debian/patches/info_core_dump_small_window
deleted file mode 100644
index c085ab6..0000000
--- a/debian/patches/info_core_dump_small_window
+++ /dev/null
@@ -1,17 +0,0 @@
---- texinfo-4.13a.dfsg.1.orig/info/window.c 2008-09-18 20:31:59.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/info/window.c 2011-02-09 15:51:46.000000000 +0100
-@@ -923,7 +923,13 @@
- break;
- }
-
-- return i - 1;
-+ /* Something is wrong with the above logic as it allows a negative
-+ index to be returned for small windows. Until someone figures it
-+ out, at least don't core dump. */
-+ if (i>0)
-+ return i - 1;
-+ else
-+ return 0;
- }
-
- /* Get and return the goal column for this window. */
diff --git a/debian/patches/info_universal_argument b/debian/patches/info_universal_argument
old mode 100755
new mode 100644
index e007dc1..cd2e7fb
--- a/debian/patches/info_universal_argument
+++ b/debian/patches/info_universal_argument
@@ -1,32 +1,25 @@
-50_info_universal_argument.dpatch by Peter De Wachter <pdewacht@vub.ac.be>
-
-fix crash in info under nl locale
-
+fix some .po files that have wrong references
---
po/ro.po | 2 +-
po/tr.po | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: texinfo-4.13a.dfsg.1/po/ro.po
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/po/ro.po 2008-09-18 20:38:32.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/po/ro.po 2009-03-09 15:17:06.000000000 +0100
-@@ -1681,7 +1681,7 @@
+--- texinfo.orig/po/ro.po
++++ texinfo/po/ro.po
+@@ -1733,7 +1733,7 @@
- #: info/session.c:5149
+ #: info/session.c:5210
msgid "Internally used by \\[universal-argument]"
-msgstr "Folosit intern de \\[argument-universal]"
+msgstr "Folosit intern de \\[universal-argument]"
#: info/tilde.c:336
#, c-format
-Index: texinfo-4.13a.dfsg.1/po/tr.po
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/po/tr.po 2008-09-18 20:38:33.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/po/tr.po 2009-03-09 15:17:06.000000000 +0100
-@@ -1683,7 +1683,7 @@
+--- texinfo.orig/po/tr.po
++++ texinfo/po/tr.po
+@@ -1736,7 +1736,7 @@
- #: info/session.c:5149
+ #: info/session.c:5210
msgid "Internally used by \\[universal-argument]"
-msgstr "Dahili olarak \\[universal argument] taraf�kullan�"
+msgstr "Dahili olarak \\[universal-argument] taraf�kullan�"
diff --git a/debian/patches/int2size_t-fix-page-truncation b/debian/patches/int2size_t-fix-page-truncation
deleted file mode 100644
index ab9ca67..0000000
--- a/debian/patches/int2size_t-fix-page-truncation
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/info/window.c
-+++ b/info/window.c
-@@ -1587,7 +1587,7 @@
- const char *carried_over_ptr;
- size_t carried_over_len, carried_over_count;
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
- int replen;
- int delim = 0;
- int rc;
-@@ -1760,7 +1760,7 @@
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
-
- if (cur_len == 1)
- {
-@@ -1858,7 +1858,7 @@
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
- int replen;
-
- if (cur_ptr >= endp)
diff --git a/debian/patches/minor-buffer-size-fix b/debian/patches/minor-buffer-size-fix
deleted file mode 100644
index fa418ff..0000000
--- a/debian/patches/minor-buffer-size-fix
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Kees Cook <kees@ubuntu.com>
-Description: extend stack buffers to be large enough for the type values
- they are expected to hold.
-Bug: https://savannah.gnu.org/bugs/?32122
-Bug-Ubuntu: https://launchpad.net/bugs/569802
-
-Index: texinfo-4.13a.dfsg.1/makeinfo/sectioning.c
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/makeinfo/sectioning.c 2011-01-13 14:12:35.382016526 -0800
-+++ texinfo-4.13a.dfsg.1/makeinfo/sectioning.c 2011-01-13 14:14:41.285127427 -0800
-@@ -256,13 +256,13 @@
- return xstrdup ("");
- else if (enum_marker == APPENDIX_MAGIC)
- {
-- char s[1];
-+ char s[2];
- sprintf (s, "%c", numbers[0] + 64);
- return xstrdup (s);
- }
- else
- {
-- char s[5];
-+ char s[32];
- sprintf (s, "%d", numbers[0]);
- return xstrdup (s);
- }
diff --git a/debian/patches/numerical-signal-names b/debian/patches/numerical-signal-names
new file mode 100644
index 0000000..8893dc3
--- /dev/null
+++ b/debian/patches/numerical-signal-names
@@ -0,0 +1,60 @@
+replace numerical signal names with symbolical
+---
+ util/fix-info-dir | 6 +++---
+ util/fixfonts | 2 +-
+ util/install-info-html | 2 +-
+ util/texi2dvi | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+--- texinfo.orig/util/fixfonts
++++ texinfo/util/fixfonts
+@@ -33,7 +33,7 @@
+ tempfile2="${TMPDIR}/circ2$$"
+
+ # EXIT SIGHUP SIGINT SIGQUIT SIGTERM
+-#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 1 2 3 15
++#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 HUP INT QUIT TERM
+
+ # Find all the fonts with names that include `circle'.
+ (cd "${texfontdir}"; find . -name '*circle*' -print > "${tempfile}")
+--- texinfo.orig/util/install-info-html
++++ texinfo/util/install-info-html
+@@ -39,7 +39,7 @@
+ $debug_echo "cleaning ($?)..."
+ }
+
+-trap cleanup 0 9 15
++trap cleanup 0 KILL TERM
+
+ #
+ # Find command line options and switches
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
+@@ -1949,7 +1949,7 @@
+ sed "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
+ esac
+ # Remove it at exit if clean mode.
+- trap "cleanup" 0 1 2 15
++ trap "cleanup" 0 HUP INT TERM
+
+ ensure_dir "$build_dir" "$t2ddir"
+
+--- texinfo.orig/util/fix-info-dir
++++ texinfo/util/fix-info-dir
+@@ -255,13 +255,13 @@
+
+ trap ' eval "$DEBUG"; rm -f $TMP_FILE_LIST; exit ' 0
+ trap ' rm -f $TMP_FILE_LIST
+- exit ' 1
++ exit ' HUP
+ trap ' rm -f $TMP_FILE_LIST
+ echo "$0:$LINENO: received INT signal.">&2
+- exit ' 2
++ exit ' INT
+ trap ' rm -f $TMP_FILE_LIST
+ echo "$0:$LINENO: received QUIT signal.">&2
+- exit ' 3
++ exit ' QUIT
+
+ sed -e "1,/$MENU_BEGIN/d" -e "$MENU_FILTER1" -e "$MENU_FILTER2"<$DIR_FILE\
+ |sed -n -e '/\* /{
diff --git a/debian/patches/replace_egrep_fgrep_sigs b/debian/patches/replace_egrep_fgrep_sigs
deleted file mode 100755
index e00fca3..0000000
--- a/debian/patches/replace_egrep_fgrep_sigs
+++ /dev/null
@@ -1,103 +0,0 @@
-40_replace_egrep_fgrep_sigs.dpatch by David Weinehall <tao@debian.org>
-
-Replace egrep by grep -E, fgrep by grep -F, and numerical signals
-by signal names
-
----
- makeinfo/tests/cond | 16 ++++++++--------
- util/fixfonts | 2 +-
- util/gen-dir-node | 6 +++---
- util/texi2dvi | 2 +-
- 4 files changed, 13 insertions(+), 13 deletions(-)
-
-Index: texinfo-4.13a.dfsg.1/makeinfo/tests/cond
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/makeinfo/tests/cond 2005-04-05 23:04:16.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/makeinfo/tests/cond 2009-03-09 15:16:58.000000000 +0100
-@@ -6,28 +6,28 @@
-
- # Default Info output.
- ../makeinfo -o cond.out $srcdir/cond.txi || exit 1
--egrep 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \
-+grep -E 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \
- || exit 2
--test `fgrep -c ' text.' cond.out` -eq 3 || exit 3
-+test `grep -F -c ' text.' cond.out` -eq 3 || exit 3
-
- # Default HTML output.
- ../makeinfo --no-split --html -o cond.out $srcdir/cond.txi || exit 1
--egrep 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \
-+grep -E 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \
- || exit 2
--test `fgrep -c ' text.' cond.out` -eq 4 || exit 3
-+test `grep -F -c ' text.' cond.out` -eq 4 || exit 3
-
- # --ifhtml off, --ifinfo off, --iftex off.
- ../makeinfo --no-ifhtml --no-ifinfo --no-iftex -o cond.out $srcdir/cond.txi || exit 1
--egrep 'This is ifnot(html|info|tex) text' cond.out >/dev/null \
-+grep -E 'This is ifnot(html|info|tex) text' cond.out >/dev/null \
- || exit 2
--test `fgrep -c ' text.' cond.out` -eq 3 || exit 3
-+test `grep -F -c ' text.' cond.out` -eq 3 || exit 3
-
- # Do we really need to test all the other permutations?
-
- # --ifhtml on, --ifinfo on, --iftex on.
- ../makeinfo --ifhtml --ifinfo --iftex -o cond.out $srcdir/cond.txi || exit 1
--egrep 'This is (html|ifhtml|ifinfo|tex|iftex) text' cond.out >/dev/null \
-+grep -E 'This is (html|ifhtml|ifinfo|tex|iftex) text' cond.out >/dev/null \
- || exit 2
--test `fgrep -c ' text.' cond.out` -eq 5 || exit 3
-+test `grep -F -c ' text.' cond.out` -eq 5 || exit 3
-
- rm -f cond.out cond.info
-Index: texinfo-4.13a.dfsg.1/util/fixfonts
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/fixfonts 2002-08-26 01:38:39.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/util/fixfonts 2009-03-09 15:16:58.000000000 +0100
-@@ -33,7 +33,7 @@
- tempfile2="${TMPDIR}/circ2$$"
-
- # EXIT SIGHUP SIGINT SIGQUIT SIGTERM
--#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 1 2 3 15
-+#trap 'rm -f "${tempfile}" "${tempfile2}"' 0 HUP INT QUIT TERM
-
- # Find all the fonts with names that include `circle'.
- (cd "${texfontdir}"; find . -name '*circle*' -print > "${tempfile}")
-Index: texinfo-4.13a.dfsg.1/util/gen-dir-node
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/gen-dir-node 2004-04-11 19:56:47.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/util/gen-dir-node 2009-03-09 15:16:58.000000000 +0100
-@@ -79,7 +79,7 @@
- ### then generate entries for those in the same way, putting the info for
- ### those at the end....
-
--infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')`
-+infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*$' | grep -E -v '^dir$|^dir\.info$|^dir\.orig$')`
-
- # echoing gets clobbered by backquotes; we do it the hard way...
- lines=`wc $SKELETON | awk '{print $1}'`
-@@ -166,8 +166,8 @@
-
- # Sort remaining files by INFO-DIR-SECTION.
- prevsect=
--filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \
-- fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \
-+filesectdata=`(cd ${INFODIR}; grep -F INFO-DIR-SECTION /dev/null ${infofiles} | \
-+ grep -F -v 'INFO-DIR-SECTION Miscellaneous' | \
- sort -t: -k2 -k1 | tr ' ' '_')`
- for sectdata in ${filesectdata}; do
- file=`echo ${sectdata} | cut -d: -f1`
-Index: texinfo-4.13a.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi 2009-03-09 15:16:49.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi 2009-03-09 15:16:58.000000000 +0100
-@@ -1760,7 +1760,7 @@
- sed 's,/,!,g'`
- esac
- # Remove it at exit if clean mode.
-- trap "cleanup" 0 1 2 15
-+ trap "cleanup" 0 HUP INT TERM
-
- ensure_dir "$build_dir" "$t2ddir"
-
diff --git a/debian/patches/series b/debian/patches/series
index 9e2cf94..b856b7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,4 @@
-# applied to upstream as of 4.13a
-# fix-direntry
-# fix-texi2dvi-bashism
warn_missing_tex
-replace_egrep_fgrep_sigs
+numerical-signal-names
info_universal_argument
dont_build_info
-texi-allow-tilde
-check-nodes-boundaries
-info_core_dump_small_window
-minor-buffer-size-fix
-texi2dvi-local-fallback-syntax.diff
-texi2dvi_non-C_locale
-texi-allow-shell-escape.diff
-int2size_t-fix-page-truncation
diff --git a/debian/patches/texi-allow-shell-escape.diff b/debian/patches/texi-allow-shell-escape.diff
deleted file mode 100644
index a9d5870..0000000
--- a/debian/patches/texi-allow-shell-escape.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN texinfo-4.13a.dfsg.1_svn/util/texi2dvi texinfo-4.13a.dfsg.1/util/texi2dvi
---- texinfo-4.13a.dfsg.1_svn/util/texi2dvi 2012-02-07 13:45:49.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi 2012-02-07 13:47:53.000000000 +0100
-@@ -69,6 +69,7 @@
- recode=false
- set_language=
- src_specials=
-+shell_escape=
- textra= # Extra TeX commands to insert in the input file.
- txiprereq=19990129 # minimum texinfo.tex version with macro expansion
- verb=false # true for verbose mode
-@@ -331,6 +332,7 @@
- -p, --pdf use pdftex or pdflatex for processing
- -r, --recode call recode before TeX to translate input
- --recode-from=ENC recode from ENC to the @documentencoding
-+ --shell-escape pass --shell-escape to TeX
- --src-specials pass --src-specials to TeX
- -t, --command=CMD insert CMD in copy of input file
- or --texinfo=CMD multiple values accumulate
-@@ -936,6 +938,9 @@
- # source, given a sufficiently smart editor), if specifed.
- test -n "$src_specials" && cmd="$cmd $src_specials"
-
-+ # Tell TeX to allow running external executables
-+ test -n "$shell_escape" && cmd="$cmd $shell_escape"
-+
- # Tell TeX to be batch if requested.
- if $batch; then
- # \batchmode does not show terminal output at all, so we don't
-@@ -1563,6 +1568,7 @@
- -r | --recode) recode=true;;
- --recode-from) shift; recode=true; recode_from="$1";;
- --src-specials) src_specials=--src-specials;;
-+ --shell-escape) shell_escape=--shell-escape;;
- -t | --texinfo | --command ) shift; textra="$textra\\
- "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
- --text) out_lang=text;;
diff --git a/debian/patches/texi-allow-tilde b/debian/patches/texi-allow-tilde
deleted file mode 100644
index cd83522..0000000
--- a/debian/patches/texi-allow-tilde
+++ /dev/null
@@ -1,74 +0,0 @@
-texi-allow-tilde patch by Karl Berry
-included upstream
-
- calling texi2dvi /path/with~tilde/in/the/path.texi breaks
-
-I installed the patch below (modulo documentation, etc.) to support tildes.
-There's an undocumented -~ option to avoid all this madness in case it's
-totally broken. Hope none of these literal tildes mess anything up.
-
-More special characters could be supported, but then we'd have to assume
-a matching texinfo.tex (then -~ could come in useful). Plus, I've
-already spent too long on this for today.
-
-In any case, I advise using texi2dvi's tidy mode when special characters
-are a concern. It will work with a wider range of characters in the
-directory portion, at least. Besides being cleaner in general.
-
----
- util/texi2dvi | 26 +++++++++++++++++++++-----
- 1 file changed, 21 insertions(+), 5 deletions(-)
-
-Index: texinfo-4.13a.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi 2009-03-18 14:40:08.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi 2009-03-18 14:40:18.000000000 +0100
-@@ -56,6 +56,7 @@
- # Instead, assign them an empty value.
- action=compile
- batch=false # true for batch mode
-+catcode_special=true
- debug=false
- escape="\\"
- expand= # t for expansion via makeinfo
-@@ -938,12 +939,27 @@
- # \batchmode does not show terminal output at all, so we don't
- # want that. And even in batch mode, TeX insists on having input
- # from the user. Close its stdin to make it impossible.
-- cmd="$cmd </dev/null '${escape}nonstopmode' '${escape}input'"
-+ cmd="$cmd </dev/null '${escape}nonstopmode'"
- fi
-
-- # we'd like to handle arbitrary input file names, such as a~b.tex.
-- # This isn't a general way to do it :), though it does work, kind of.
-- # cmd="$cmd '${escape}catcode126=12 \input '"
-+ # we'd like to handle arbitrary input file names, especially
-+ # foo~bar/a~b.tex, since Debian likes ~ characters.
-+ if $catcode_special; then
-+ # $normaltilde is just to reduce line length in this source file.
-+ # The idea is to define \normaltilde as a catcode other ~ character,
-+ # then make the active ~ be equivalent to that, instead of the plain
-+ # TeX tie. Then when the active ~ appears in the filename, it will
-+ # be expanded to itself, as far as \input will see. (This is the
-+ # same thing that texinfo.tex does in general, BTW.)
-+ normaltilde="${escape}catcode126=12 ${escape}def${escape}normaltilde{~}"
-+ cmd="$cmd '$normaltilde${escape}catcode126=13 ${escape}let~\normaltilde '"
-+ fi
-+ # Other special (non-active) characters could be supported by
-+ # resetting their catcodes to other on the command line and changing
-+ # texinfo.tex to initialize everything to plain catcodes. Maybe someday.
-+
-+ # append the \input command.
-+ cmd="$cmd '${escape}input'"
-
- # TeX's \input does not (easily or reliably) support whitespace
- # characters or other special characters in file names. Our intensive
-@@ -958,7 +974,7 @@
- # harm in making the link.
- #
- case $tidy:`func_dirname "$in_input"` in
-- true:*["$space$tab$newline\"#\$%\\^_{}"]*)
-+ true:*["$space$tab$newline\"#\$%\\^_{}~"]*)
- _run_tex_file_name=`basename "$in_input"`
- if test ! -f "$_run_tex_file_name"; then
- # It might not be a file, clear it.
diff --git a/debian/patches/texi2dvi-local-fallback-syntax.diff b/debian/patches/texi2dvi-local-fallback-syntax.diff
deleted file mode 100644
index e2be74b..0000000
--- a/debian/patches/texi2dvi-local-fallback-syntax.diff
+++ /dev/null
@@ -1,21 +0,0 @@
- ChangeLog | 7 +++++++
- util/texi2dvi | 4 +++-
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
---- texinfo-4.12.dfsg.1.orig/util/texi2dvi
-+++ texinfo-4.12.dfsg.1/util/texi2dvi
-@@ -141,11 +141,13 @@ test -n "$TEX" && test -d "$TEX" && unset TEX
- }
- test_local >/dev/null 2>&1
- test $foo = bar
--) || local () {
-+) || eval '
-+local () {
- case $1 in
- *=*) eval "$1";;
- esac
- }
-+'
-
-
- # cd_orig
diff --git a/debian/patches/texi2dvi_non-C_locale b/debian/patches/texi2dvi_non-C_locale
deleted file mode 100644
index 32ed3c7..0000000
--- a/debian/patches/texi2dvi_non-C_locale
+++ /dev/null
@@ -1,18 +0,0 @@
-"grep [A-z]" is not allowed in non-C locale.
----
- util/texi2dvi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: texinfo-4.12.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi.orig 2010-11-04 15:28:50.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi 2010-11-04 15:35:14.000000000 +0100
-@@ -1710,7 +1710,7 @@
-
- # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
- # prepend `./' in order to avoid that the tools take it as an option.
-- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
-+ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \
- || command_line_filename="./$command_line_filename"
-
- # See if the file exists. If it doesn't we're in trouble since, even
diff --git a/debian/patches/warn_missing_tex b/debian/patches/warn_missing_tex
old mode 100755
new mode 100644
index 7e04ff6..f3f037b
--- a/debian/patches/warn_missing_tex
+++ b/debian/patches/warn_missing_tex
@@ -1,14 +1,12 @@
20_warn_missing_tex.dpatch by <preining@logic.at>
---
- util/texi2dvi | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ util/texi2dvi | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
-Index: texinfo-4.13a.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi 2008-09-18 20:46:01.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi 2009-03-09 15:16:49.000000000 +0100
-@@ -32,6 +32,17 @@
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
+@@ -33,6 +33,19 @@
# No failure shall remain unpunished.
set -e
@@ -23,6 +21,8 @@ Index: texinfo-4.13a.dfsg.1/util/texi2dvi
+ exit 1
+fi
+
- # This string is expanded by rcs automatically when this file is checked out.
- rcs_revision='$Revision: 1.135 $'
++
++
+ # This string is expanded automatically when this file is checked out.
+ rcs_revision='$Revision: 1.173 $'
rcs_version=`set - $rcs_revision; echo $2`
--
Debian packaging of texinfo)
Reply to: