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

[Norbert Preining]

Hi Scott,

To finish this up, here is a debdiff between 4.0.0-1 and my version
that did build in a clean chroot.

All the best

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
------------------------------------------------------------------------
-------------- next part --------------
diff -Nru octave-4.0.0/debian/changelog octave-4.0.0/debian/changelog
--- octave-4.0.0/debian/changelog	2015-06-04 21:19:33.000000000 +0900
+++ octave-4.0.0/debian/changelog	2015-07-06 16:11:30.000000000 +0900
@@ -1,3 +1,9 @@
+octave (4.0.0-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+
+ -- Norbert Preining <preining at debian.org>  Mon, 06 Jul 2015 16:01:02 +0900
+
 octave (4.0.0-1) experimental; urgency=low
 
   [ S?bastien Villemot ]
diff -Nru octave-4.0.0/debian/control octave-4.0.0/debian/control
--- octave-4.0.0/debian/control	2015-06-04 21:19:33.000000000 +0900
+++ octave-4.0.0/debian/control	2015-07-06 16:11:30.000000000 +0900
@@ -49,6 +49,7 @@
   texinfo,
   texlive-generic-recommended,
   texlive-latex-base,
+  texlive-fonts-recommended,
   transfig,
   unzip,
   xauth,
diff -Nru octave-4.0.0/debian/patches/dont-use-included-texinfo-texmfcnf octave-4.0.0/debian/patches/dont-use-included-texinfo-texmfcnf
--- octave-4.0.0/debian/patches/dont-use-included-texinfo-texmfcnf	1970-01-01 09:00:00.000000000 +0900
+++ octave-4.0.0/debian/patches/dont-use-included-texinfo-texmfcnf	2015-07-06 16:11:30.000000000 +0900
@@ -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 \
diff -Nru octave-4.0.0/debian/patches/escape-backslash-for-texinfo-in-source octave-4.0.0/debian/patches/escape-backslash-for-texinfo-in-source
--- octave-4.0.0/debian/patches/escape-backslash-for-texinfo-in-source	1970-01-01 09:00:00.000000000 +0900
+++ octave-4.0.0/debian/patches/escape-backslash-for-texinfo-in-source	2015-07-06 16:11:30.000000000 +0900
@@ -0,0 +1,27 @@
+---
+ libinterp/corefcn/utils.cc |    2 +-
+ scripts/io/beep.m          |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- octave.orig/libinterp/corefcn/utils.cc
++++ octave/libinterp/corefcn/utils.cc
+@@ -1379,7 +1379,7 @@
+ \n\
+ Implementation Note: Strings are first converted to double values before the\n\
+ checks for valid indices are made.  Unless a string contains the NULL\n\
+-character @nospell{\"\\0\"}, it will always be a valid index.\n\
++character @nospell{\"\\\\0\"}, it will always be a valid index.\n\
+ @end deftypefn")
+ {
+   octave_value retval;
+--- octave.orig/scripts/io/beep.m
++++ octave/scripts/io/beep.m
+@@ -20,7 +20,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{puts, fputs, printf, fprintf}
diff -Nru octave-4.0.0/debian/patches/series octave-4.0.0/debian/patches/series
--- octave-4.0.0/debian/patches/series	2015-06-04 21:19:33.000000000 +0900
+++ octave-4.0.0/debian/patches/series	2015-07-06 16:11:30.000000000 +0900
@@ -7,3 +7,5 @@
 always-build-octave-jar.patch
 hdf5-flags.patch
 hdf5-mkoctfile.patch
+dont-use-included-texinfo-texmfcnf
+escape-backslash-for-texinfo-in-source