[Pkg-octave-devel] Bug#790626: Octave FTBFS With Texinfo 6

[Norbert Preining <preining@logic.at>]

Hi Scott,

ok, here is what you have to do, but I cannot *fully* fix it 
as the problem comes from 
	munge-texi.pl

What needs to be done are three things:

* add texlive-fonts-recommended to the build deps
  this is necessary for newer texinfo (although nobody knows why ;-)

diff --git a/debian/control b/debian/control
index 909c1bc..b09a0e8 100644
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Build-Depends: automake,
   texinfo,
   texlive-generic-recommended,
   texlive-latex-base,
+  texlive-fonts-recommended,
   transfig,
   unzip,
   xauth,

* do NOT use the shipped texinfo.tex, and at the same time also don't
  use the shipped texmf.cnf
  the shipped texinfo.tex is too old and needs to be dropped
  the texmf.cnf change is not necessary anymore

diff --git a/debian/patches/dont-use-included-texinfo-texmfcnf b/debian/patches/dont-use-included-texinfo-texmfcnf
new file mode 100644
index 0000000..15d6da1
--- /dev/null
+++ b/debian/patches/dont-use-included-texinfo-texmfcnf
@@ -0,0 +1,23 @@
+---
+ doc/interpreter/Makefile.am |   10 ----------
+ 1 file changed, 10 deletions(-)
+
+--- octave.orig/doc/interpreter/Makefile.am
++++ octave/doc/interpreter/Makefile.am
+@@ -20,16 +20,6 @@
+ 
+ include $(top_srcdir)/build-aux/common.mk
+ 
+-TEXINFO_TEX = ../texinfo.tex
+-
+-## Leading PATH_SEPARATOR required due to weak parsing by dvips (12/04/09)
+-TEXINPUTS := "$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR)"
+-export TEXINPUTS
+-
+-## Include custom texmf.cnf necessary to run @seealso macro
+-TEXMFCNF := "..$(PATH_SEPARATOR)$(srcdir)/..$(PATH_SEPARATOR)$(TEXMFCNF)$(PATH_SEPARATOR)"
+-export TEXMFCNF
+-
+ dist_man_MANS = \
+   mkoctfile.1 \
+   octave-cli.1 \


* finally the critical part - fix the argument processing in texinfo source
  the problem is basically that 
	munge-texi.pl
  creates code like
	@qcode{"\a"}
  which needs to be changed to
	@qcode{"\\a"}

  THere are *two* occurrences, one in expr.texi (@nospell{"\0"}) and one
  in errors.texi (@qcode{"\a"}). Below patch changes that in the 
  *generated* texi files, but when doing a full rebuild these changes
  are overwritten, so one needs to look into the munge script.

--- /dev/null
+++ b/debian/patches/texinfo6-source-fixes
@@ -0,0 +1,27 @@
+---
+ doc/interpreter/errors.texi |    2 +-
+ doc/interpreter/expr.texi   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- octave.orig/doc/interpreter/errors.texi
++++ octave/doc/interpreter/errors.texi
+@@ -231,7 +231,7 @@
+ @deftypefn {Function File} {} beep ()
+ Produce a beep from the speaker (or visual bell).
+ 
+-This function sends the alarm character @qcode{"\a"} to the terminal.
++This function sends the alarm character @qcode{"\\a"} to the terminal.
+ Depending on the user's configuration this may produce an audible beep,
+ a visual bell, or nothing at all.
+ @seealso{@ref{XREFputs,,puts}, @ref{XREFfputs,,fputs}, @ref{XREFprintf,,printf}, @ref{XREFfprintf,,fprintf}}
+--- octave.orig/doc/interpreter/expr.texi
++++ octave/doc/interpreter/expr.texi
+@@ -370,7 +370,7 @@
+ 
+ Implementation Note: Strings are first converted to double values before the
+ checks for valid indices are made.  Unless a string contains the NULL
+-character @nospell{"\0"}, it will always be a valid index.
++character @nospell{"\\0"}, it will always be a valid index.
+ @end deftypefn
+ 
+ 


I confirmed that with the above changes, the documentation builds
without any problem.

What is left is to find the fix for the txi -> texi munging.

Hope that helps

Norbert

------------------------------------------------------------------------
PREINING, Norbert                               http://www.preining.info
JAIST, Japan                                 TeX Live & Debian Developer
GPG: 0x860CDC13   fp: F7D8 A928 26E3 16A1 9FA0  ACF0 6CAC A448 860C DC13
------------------------------------------------------------------------