Import Debian changes 3b1-4debian/3b1-4

slib (3b1-4) unstable; urgency=medium

  * QA upload.
  * Set maintainer to Debian QA Group (#721062)
  * Backport changes from upstream to fix build with texinfo 5.
    Closes: #712322
  * Use local version of schmooz.scm to make sure this fix is actually
    used.

5 files changed, 717 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 6e15e00..55ca454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+slib (3b1-4) unstable; urgency=medium
+
+  * QA upload.
+  * Set maintainer to Debian QA Group (#721062)
+  * Backport changes from upstream to fix build with texinfo 5.
+    Closes: #712322
+  * Use local version of schmooz.scm to make sure this fix is actually
+    used.
+
+ -- Ivo De Decker <ivodd@debian.org>  Tue, 11 Nov 2014 17:46:53 +0100
+
 slib (3b1-3.1) unstable; urgency=low
 
   [ Jari Aalto ]
diff --git a/debian/control b/debian/control
index 488d306..6e3063f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: slib
 Section: devel
 Priority: optional
-Maintainer: Thomas Bushnell, BSG <tb@debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends-Indep: scm, texi2html, texinfo, debhelper (>= 7.1)
 Standards-Version: 3.8.4
 Homepage: http://people.csail.mit.edu/jaffer/SLIB.html
diff --git a/debian/patches/712322_fix_doc_build.patch b/debian/patches/712322_fix_doc_build.patch
new file mode 100644
index 0000000..f2b4985
--- /dev/null
+++ b/debian/patches/712322_fix_doc_build.patch
@@ -0,0 +1,682 @@
+Description: Fix texinfo files for texinfo 5
+ This is a backport of a number of fixes from upstream to make sure that the
+ texinfo files are compatible with textinfo 5. It also fixes the code that
+ generates some of these files.
+Bug-Debian: http://bugs.debian.org/712322
+Forwarded: not-needed
+
+
+Index: slib/phil-spc.scm
+===================================================================
+--- slib.orig/phil-spc.scm
++++ slib/phil-spc.scm
+@@ -136,8 +136,9 @@
+ ;;@defun integer->gray-code k
+ ;;Converts @var{k} to a Gray code of the same @code{integer-length} as
+ ;;@var{k}.
++;;@end defun
+ ;;
+-;;@defunx gray-code->integer k
++;;@defun gray-code->integer k
+ ;;Converts the Gray code @var{k} to an integer of the same
+ ;;@code{integer-length} as @var{k}.
+ ;;
+Index: slib/schmooz.texi
+===================================================================
+--- slib.orig/schmooz.texi
++++ slib/schmooz.texi
+@@ -17,8 +17,9 @@ existing file containing Scheme source c
+ top-level comments containing schmooz commands from @var{filename}.scm
+ and writes the converted Texinfo source to a file named
+ @var{filename}.txi.
++@end deffn
+ 
+-@deffnx Procedure schmooz filename@r{.texi} @dots{}
++@deffn Procedure schmooz filename@r{.texi} @dots{}
+ @deffnx Procedure schmooz filename@r{.tex} @dots{}
+ @deffnx Procedure schmooz filename@r{.txi} @dots{}
+ @var{Filename} should be a string naming an existing file containing
+Index: slib/slib.texi
+===================================================================
+--- slib.orig/slib.texi
++++ slib/slib.texi
+@@ -816,11 +816,13 @@ and the name of the operating system.  A
+ Displays the information of @code{(slib:report-version)} followed by
+ almost all the information neccessary for submitting a problem report.
+ An unspecified value is returned.
++@end defun
+ 
+-@defunx slib:report #t
++@defun slib:report #t
+ provides a more verbose listing.
++@end defun
+ 
+-@defunx slib:report filename
++@defun slib:report filename
+ Writes the report to file @file{filename}.
+ 
+ @example
+@@ -944,8 +946,9 @@ omitted, in which case it defaults to th
+ current position of the character in @var{port} which will next be
+ read or written.  If the implementation does not support
+ file-position, then @code{#f} is returned.
++@end defun
+ 
+-@defunx file-position port k
++@defun file-position port k
+ @var{port} must be open to a file.  @code{file-position} sets the
+ current position in @var{port} which will next be read or written.  If
+ successful, @code{#f} is returned; otherwise @code{file-position}
+@@ -3390,7 +3393,7 @@ non-numeric conversions.
+ A character that specifies the conversion to be applied.
+ @end itemize
+ 
+-@subsubsection Exact Conversions
++Exact Conversions
+ 
+ @table @asis
+ @item @samp{b}, @samp{B}
+@@ -3416,7 +3419,7 @@ using the digits @samp{0123456789abcdef}
+ digits @samp{0123456789ABCDEF}.
+ @end table
+ 
+-@subsubsection Inexact Conversions
++Inexact Conversions
+ 
+ @table @asis
+ @item @samp{f}
+@@ -3441,7 +3444,8 @@ dot between number and prefix, @samp{%k}
+ 
+ @end table
+ 
+-@subsubsection Other Conversions
++Other Conversions
++
+ @table @asis
+ @item @samp{c}
+ Print a single character.  The @samp{-} flag is the only one which can
+@@ -4582,11 +4586,13 @@ compatability.  Because of shared state
+ 
+ @defun tzset
+ Returns the default time-zone.
++@end defun
+ 
+-@defunx tzset tz
++@defun tzset tz
+ Sets (and returns) the default time-zone to @var{tz}.
++@end defun
+ 
+-@defunx tzset TZ-string
++@defun tzset TZ-string
+ Sets (and returns) the default time-zone to that specified by
+ @var{TZ-string}.
+ 
+@@ -4660,11 +4666,13 @@ is a datatype encapsulating time.
+ 
+ @defun gmtime caltime
+ Converts the calendar time @var{caltime} to UTC and returns it.
++@end defun
+ 
+-@defunx localtime caltime tz
++@defun localtime caltime tz
+ Returns @var{caltime} converted to UTC relative to timezone @var{tz}.
++@end defun
+ 
+-@defunx localtime caltime
++@defun localtime caltime
+ converts the calendar time @var{caltime} to a vector of integers
+ expressed relative to the user's time zone.  @code{localtime} sets the
+ variable @var{*timezone*} with the difference between Coordinated
+@@ -4676,12 +4684,14 @@ Universal Time (UTC) and local standard
+ @defun gmktime univtime
+ Converts a vector of integers in GMT Coordinated Universal Time (UTC)
+ format to a calendar time.
++@end defun
+ 
+-@defunx mktime univtime
++@defun mktime univtime
+ Converts a vector of integers in local Coordinated Universal Time (UTC)
+ format to a calendar time.
++@end defun
+ 
+-@defunx mktime univtime tz
++@defun mktime univtime tz
+ Converts a vector of integers in Coordinated Universal Time (UTC) format
+ (relative to time-zone @var{tz})
+ to calendar time.
+@@ -5085,8 +5095,9 @@ reversed.
+ @code{integer->list} returns a list of @var{len} booleans corresponding
+ to each bit of the given integer.  #t is coded for each 1; #f for 0.
+ The @var{len} argument defaults to @code{(integer-length @var{k})}.
++@end defun
+ 
+-@defunx list->integer list
++@defun list->integer list
+ @code{list->integer} returns an integer formed from the booleans in the
+ list @var{list}, which must be a list of booleans.  A 1 bit is coded for
+ each #t; a 0 bit for #f.
+@@ -5508,8 +5519,9 @@ Computes the P1003.2/D11.2 (POSIX.2) 32-
+ (cksum (in-vicinity (library-vicinity) "ratize.scm"))
+ @result{} 157103930
+ @end example
++@end defun
+ 
+-@defunx cksum port
++@defun cksum port
+ Computes the checksum of the bytes read from @var{port} until the
+ end-of-file.
+ 
+@@ -5528,8 +5540,9 @@ checksum of the bytes in @var{str}, can
+ @defun crc16 file
+ 
+ Computes the USB data-packet (16-bit) CRC of @var{file}.
++@end defun
+ 
+-@defunx crc16 port
++@defun crc16 port
+ Computes the USB data-packet (16-bit) CRC of the bytes read from
+ @var{port} until the end-of-file.
+ 
+@@ -5541,8 +5554,9 @@ in http://www.usb.org/developers/data/cr
+ @defun crc5 file
+ 
+ Computes the USB token (5-bit) CRC of @var{file}.
++@end defun
+ 
+-@defunx crc5 port
++@defun crc5 port
+ Computes the USB token (5-bit) CRC of the bytes read from
+ @var{port} until the end-of-file.
+ 
+@@ -5736,8 +5750,9 @@ encountered in practice and the literatu
+ 
+ @defun color? obj
+ Returns #t if @var{obj} is a color.
++@end defun
+ 
+-@defunx color? obj typ
++@defun color? obj typ
+ Returns #t if @var{obj} is a color of color-space @var{typ}.  The symbol
+ @var{typ} must be one of:
+ 
+@@ -5950,14 +5965,16 @@ values.
+ Loads the Spectral Tristimulus Values
+ @cite{CIE 1964 Supplementary Standard Colorimetric Observer},
+ defining @var{cie:x-bar}, @var{cie:y-bar}, and @var{cie:z-bar}.
++@end deftp
+ 
+-@deftpx {Feature} cie1931
++@deftp {Feature} cie1931
+ @ftindex cie1931
+ Loads the Spectral Tristimulus Values
+ @cite{CIE 1931 Supplementary Standard Colorimetric Observer},
+ defining @var{cie:x-bar}, @var{cie:y-bar}, and @var{cie:z-bar}.
++@end deftp
+ 
+-@deftpx {Feature} ciexyz
++@deftp {Feature} ciexyz
+ @ftindex ciexyz
+ Requires Spectral Tristimulus Values, defaulting to cie1931,
+ defining @var{cie:x-bar}, @var{cie:y-bar}, and @var{cie:z-bar}.
+@@ -6026,8 +6043,9 @@ result of applying @var{proc} to each el
+ computes the CIEXYZ(1931) values for the spectrum returned by @var{proc}
+ when called with arguments from 380e-9 to 780e-9, the wavelength in
+ meters.
++@end defun
+ 
+-@defunx spectrum->XYZ spectrum x1 x2
++@defun spectrum->XYZ spectrum x1 x2
+ @var{x1} and @var{x2} must be positive real numbers specifying the
+ wavelengths (in meters) corresponding to the zeroth and last elements of
+ vector or list @var{spectrum}.  @code{spectrum->XYZ} returns the
+@@ -6149,8 +6167,9 @@ Returns a three element list: the @var{x
+ scales each chromaticity so it sums to 1 or less; and divides the
+ @var{Y} values by the maximum @var{Y} in the dataset, so all lie between
+ 0 and 1.
++@end defun
+ 
+-@defunx xyY:normalize-colors colors n
++@defun xyY:normalize-colors colors n
+ If @var{n} is positive real, then @code{xyY:normalize-colors} divides
+ the @var{Y} values by @var{n} times the maximum @var{Y} in the dataset.
+ 
+@@ -6195,8 +6214,9 @@ color2 in the function entries.
+ 
+ @defun L*a*b*:DE* lab1 lab2
+ Returns the Euclidean distance between @var{lab1} and @var{lab2}.
++@end defun
+ 
+-@defunx CIE:DE* color1 color2 white-point
++@defun CIE:DE* color1 color2 white-point
+ @defunx CIE:DE* color1 color2
+ Returns the Euclidean distance in L*a*b* space between @var{color1} and
+ @var{color2}.
+@@ -6708,8 +6728,9 @@ Defines a rule for the case when the ope
+ @var{sub-op2}, respectively.  The argument @var{reduction} is a
+ procedure accepting 2 arguments which will be lists whose @code{car}s
+ are @var{sub-op1} and @var{sub-op2}.
++@end defun
+ 
+-@defunx cring:define-rule op sub-op1 'identity reduction
++@defun cring:define-rule op sub-op1 'identity reduction
+ Defines a rule for the case when the operation represented by symbol
+ @var{op} is applied to a list whose @code{car} is @var{sub-op1}, and
+ some other argument.  @var{Reduction} will be called with the list whose
+@@ -7195,8 +7216,9 @@ Returns a procedure of arguments @var{ke
+ returns the key-list identifying the lowest record higher than
+ @var{key1} @var{key2} @dots{} which is stored in the relational-table;
+ or false if no higher record is present.
++@end defop
+ 
+-@defopx {Operation} {relational-table} isam-next column-name
++@defop {Operation} {relational-table} isam-next column-name
+ The symbol @var{column-name} names a key field.  In the list returned
+ by @code{isam-next}, that field, or a field to its left, will be
+ changed.  This allows one to skip over less significant key fields.
+@@ -7207,8 +7229,9 @@ Returns a procedure of arguments @var{ke
+ returns the key-list identifying the highest record less than
+ @var{key1} @var{key2} @dots{} which is stored in the relational-table;
+ or false if no lower record is present.
++@end defop
+ 
+-@defopx {Operation} {relational-table} isam-prev column-name
++@defop {Operation} {relational-table} isam-prev column-name
+ The symbol @var{column-name} names a key field.  In the list returned
+ by @code{isam-next}, that field, or a field to its left, will be
+ changed.  This allows one to skip over less significant key fields.
+@@ -7248,8 +7271,9 @@ Return a list of the column names, forei
+ names, or type names respectively for this table.  These 4 methods are
+ different from the others in that the list is returned, rather than a
+ procedure to obtain the list.
++@end defop
+ 
+-@defopx {Operation} {relational-table} primary-limit
++@defop {Operation} {relational-table} primary-limit
+ Returns the number of primary keys fields in the relations in this
+ table.
+ @end defop
+@@ -7382,16 +7406,19 @@ Returns an open enhanced relational data
+ supplied, @code{open-command-database} will attempt to deduce the correct
+ base-table-type.  If the database can not be opened or if it lacks the
+ @code{*commands*} table, @code{#f} is returned.
++@end defun
+ 
+-@defunx open-command-database! filename
++@defun open-command-database! filename
+ @defunx open-command-database! filename base-table-type
+ Returns @emph{mutable} open enhanced relational database @dots{}
++@end defun
+ 
+-@defunx open-command-database database
++@defun open-command-database database
+ Returns @var{database} if it is an immutable relational database; #f
+ otherwise.
++@end defun
+ 
+-@defunx open-command-database! database
++@defun open-command-database! database
+ Returns @var{database} if it is a mutable relational database; #f
+ otherwise.
+ @end defun
+@@ -7912,32 +7939,31 @@ without-documentation called
+ 
+ Prints the names of all the tables in @var{database} and sets browse's
+ default to @var{database}.
+-
+-@deffnx {Procedure} browse
++@end deffn
++@deffn {Procedure} browse
+ 
+ Prints the names of all the tables in the default database.
+-
+-@deffnx {Procedure} browse table-name
++@end deffn
++@deffn {Procedure} browse table-name
+ 
+ For each record of the table named by the symbol @var{table-name},
+ prints a line composed of all the field values.
+-
+-@deffnx {Procedure} browse pathname
++@end deffn
++@deffn {Procedure} browse pathname
+ 
+ Opens the database named by the string @var{pathname}, prints the names
+ of all its tables, and sets browse's default to the database.
+-
+-@deffnx {Procedure} browse database table-name
++@end deffn
++@deffn {Procedure} browse database table-name
+ 
+ Sets browse's default to @var{database} and prints the records of the
+ table named by the symbol @var{table-name}.
+-
+-@deffnx {Procedure} browse pathname table-name
++@end deffn
++@deffn {Procedure} browse pathname table-name
+ 
+ Opens the database named by the string @var{pathname} and sets browse's
+ default to it; @code{browse} prints the records of the table named by
+ the symbol @var{table-name}.
+-
+ @end deffn
+ 
+ 
+@@ -8560,8 +8586,9 @@ Returns a methods procedure for a new (o
+ describing the columns of a new base table in this database, otherwise
+ returns @code{#f}.  For the fields and layout of descriptor tables,
+ @xref{Catalog Representation}.
++@end defop
+ 
+-@defopx {Operation} {relational-database} create-table table-name table-desc-name
++@defop {Operation} {relational-database} create-table table-name table-desc-name
+ Returns a methods procedure for a new (open) relational table with
+ columns as described by @var{table-desc-name}, otherwise returns
+ @code{#f}.
+@@ -9829,14 +9856,16 @@ Example:
+ @defun list-of?? predicate
+ Returns a predicate which returns true if its argument is a list every
+ element of which satisfies @var{predicate}.
++@end defun
+ 
+-@defunx list-of?? predicate low-bound high-bound
++@defun list-of?? predicate low-bound high-bound
+ @var{low-bound} and @var{high-bound} are non-negative integers.
+ @code{list-of??} returns a predicate which returns true if its argument
+ is a list of length between @var{low-bound} and @var{high-bound}
+ (inclusive); every element of which satisfies @var{predicate}.
++@end defun
+ 
+-@defunx list-of?? predicate bound
++@defun list-of?? predicate bound
+ @var{bound} is an integer.  If @var{bound} is negative, @code{list-of??}
+ returns a predicate which returns true if its argument is a list of
+ length greater than @code{(- @var{bound})}; every element of which
+@@ -10613,16 +10642,19 @@ character of the first substring of @var
+ @deffn {Procedure} find-string-from-port? str in-port max-no-chars
+ Looks for a string @var{str} within the first @var{max-no-chars} chars
+ of the input port @var{in-port}.
++@end deffn
+ 
+-@deffnx {Procedure} find-string-from-port? str in-port
++@deffn {Procedure} find-string-from-port? str in-port
+ When called with two arguments, the search span is limited by the end of
+ the input stream.
++@end deffn
+ 
+-@deffnx {Procedure} find-string-from-port? str in-port char
++@deffn {Procedure} find-string-from-port? str in-port char
+ Searches up to the first occurrence of character @var{char} in
+ @var{str}.
++@end deffn
+ 
+-@deffnx {Procedure} find-string-from-port? str in-port proc
++@deffn {Procedure} find-string-from-port? str in-port proc
+ Searches up to the first occurrence of the procedure @var{proc}
+ returning non-false when called with a character (from @var{in-port})
+ argument.
+@@ -11562,12 +11594,14 @@ printer for @code{qp}.  This example sho
+ @deffn {Procedure} trace-all file @dots{}
+ Traces (@pxref{Trace}) all procedures @code{define}d at top-level in
+ @file{file} @dots{}.
++@end deffn
+ 
+-@deffnx {Procedure} track-all file @dots{}
++@deffn {Procedure} track-all file @dots{}
+ Tracks (@pxref{Trace}) all procedures @code{define}d at top-level in
+ @file{file} @dots{}.
++@end deffn
+ 
+-@deffnx {Procedure} stack-all file @dots{}
++@deffn {Procedure} stack-all file @dots{}
+ Stacks (@pxref{Trace}) all procedures @code{define}d at top-level in
+ @file{file} @dots{}.
+ @end deffn
+@@ -11603,8 +11637,9 @@ which it was called on a continuation st
+ @defun continue
+ Pops the topmost continuation off of the continuation stack and returns
+ an unspecified value to it.
++@end defun
+ 
+-@defunx continue arg1 @dots{}
++@defun continue arg1 @dots{}
+ Pops the topmost continuation off of the continuation stack and returns
+ @var{arg1} @dots{} to it.
+ @end defun
+@@ -11612,7 +11647,9 @@ Pops the topmost continuation off of the
+ @defmac break proc1 @dots{}
+ Redefines the top-level named procedures given as arguments so that
+ @code{breakpoint} is called before calling @var{proc1} @dots{}.
+-@defmacx break
++@end defmac
++
++@defmac break
+ With no arguments, makes sure that all the currently broken identifiers
+ are broken (even if those identifiers have been redefined) and returns a
+ list of the broken identifiers.
+@@ -11620,7 +11657,9 @@ list of the broken identifiers.
+ 
+ @defmac unbreak proc1 @dots{}
+ Turns breakpoints off for its arguments.
+-@defmacx unbreak
++@end defmac
++
++@defmac unbreak
+ With no arguments, unbreaks all currently broken identifiers and returns
+ a list of these formerly broken identifiers.
+ @end defmac
+@@ -11695,7 +11734,9 @@ Prints the call-stack to @var{port} or t
+ 
+ @defmac trace proc1 @dots{}
+ Traces the top-level named procedures given as arguments.
+-@defmacx trace
++@end defmac
++
++@defmac trace
+ With no arguments, makes sure that all the currently traced identifiers
+ are traced (even if those identifiers have been redefined) and returns a
+ list of the traced identifiers.
+@@ -11703,7 +11744,8 @@ list of the traced identifiers.
+ 
+ @defmac track proc1 @dots{}
+ Traces the top-level named procedures given as arguments.
+-@defmacx track
++@end defmac
++@defmac track
+ With no arguments, makes sure that all the currently tracked identifiers
+ are tracked (even if those identifiers have been redefined) and returns
+ a list of the tracked identifiers.
+@@ -11711,7 +11753,8 @@ a list of the tracked identifiers.
+ 
+ @defmac stack proc1 @dots{}
+ Traces the top-level named procedures given as arguments.
+-@defmacx stack
++@end defmac
++@defmac stack
+ With no arguments, makes sure that all the currently stacked identifiers
+ are stacked (even if those identifiers have been redefined) and returns
+ a list of the stacked identifiers.
+@@ -11719,21 +11762,24 @@ a list of the stacked identifiers.
+ 
+ @defmac untrace proc1 @dots{}
+ Turns tracing, tracking, and  off for its arguments.
+-@defmacx untrace
++@end defmac
++@defmac untrace
+ With no arguments, untraces all currently traced identifiers and returns
+ a list of these formerly traced identifiers.
+ @end defmac
+ 
+ @defmac untrack proc1 @dots{}
+ Turns tracing, tracking, and  off for its arguments.
+-@defmacx untrack
++@end defmac
++@defmac untrack
+ With no arguments, untracks all currently tracked identifiers and returns
+ a list of these formerly tracked identifiers.
+ @end defmac
+ 
+ @defmac unstack proc1 @dots{}
+ Turns tracing, stacking, and  off for its arguments.
+-@defmacx unstack
++@end defmac
++@defmac unstack
+ With no arguments, unstacks all currently stacked identifiers and returns
+ a list of these formerly stacked identifiers.
+ @end defmac
+Index: slib/color.txi
+===================================================================
+--- slib.orig/color.txi
++++ slib/color.txi
+@@ -107,8 +107,9 @@ then @code{l*a*b*->color} returns the co
+ @defun color:l*a*b* L* a* b* white-point
+ 
+ Returns the L*a*b* color composed of @var{L*}, @var{a*}, @var{b*} with @var{white-point}.
++@end defun
+ 
+-@defunx color:l*a*b* L* a* b*
++@defun color:l*a*b* L* a* b*
+ Returns the L*a*b* color composed of @var{L*}, @var{a*}, @var{b*}.  If the coordinates
+ do not encode a valid L*a*b* color, then an error is signaled.
+ @end defun
+@@ -117,8 +118,9 @@ do not encode a valid L*a*b* color, then
+ @defun color->l*a*b* color white-point
+ 
+ Returns the list of 3 numbers encoding @var{color} in L*a*b* with @var{white-point}.
++@end defun
+ 
+-@defunx color->l*a*b* color
++@defun color->l*a*b* color
+ Returns the list of 3 numbers encoding @var{color} in L*a*b*.
+ @end defun
+ 
+@@ -138,8 +140,9 @@ then @code{l*u*v*->color} returns the co
+ @defun color:l*u*v* L* u* v* white-point
+ 
+ Returns the L*u*v* color composed of @var{L*}, @var{u*}, @var{v*} with @var{white-point}.
++@end defun
+ 
+-@defunx color:l*u*v* L* u* v*
++@defun color:l*u*v* L* u* v*
+ Returns the L*u*v* color composed of @var{L*}, @var{u*}, @var{v*}.  If the coordinates
+ do not encode a valid L*u*v* color, then an error is signaled.
+ @end defun
+@@ -148,8 +151,9 @@ do not encode a valid L*u*v* color, then
+ @defun color->l*u*v* color white-point
+ 
+ Returns the list of 3 numbers encoding @var{color} in L*u*v* with @var{white-point}.
++@end defun
+ 
+-@defunx color->l*u*v* color
++@defun color->l*u*v* color
+ Returns the list of 3 numbers encoding @var{color} in L*u*v*.
+ @end defun
+ 
+@@ -206,8 +210,9 @@ then @code{l*c*h->color} returns the col
+ @defun color:l*c*h L* C* h white-point
+ 
+ Returns the L*C*h color composed of @var{L*}, @var{C*}, @var{h} with @var{white-point}.
++@end defun
+ 
+-@defunx color:l*c*h L* C* h
++@defun color:l*c*h L* C* h
+ Returns the L*C*h color composed of @var{L*}, @var{C*}, @var{h}.  If the coordinates
+ do not encode a valid L*C*h color, then an error is signaled.
+ @end defun
+@@ -216,8 +221,9 @@ do not encode a valid L*C*h color, then
+ @defun color->l*c*h color white-point
+ 
+ Returns the list of 3 numbers encoding @var{color} in L*C*h with @var{white-point}.
++@end defun
+ 
+-@defunx color->l*c*h color
++@defun color->l*c*h color
+ Returns the list of 3 numbers encoding @var{color} in L*C*h.
+ @end defun
+ 
+@@ -326,11 +332,13 @@ specified by @var{rgb}; otherwise return
+ @defun color:e-srgb 10 r g b
+ 
+ Returns the e-sRGB10 color composed of integers @var{r}, @var{g}, @var{b}.
++@end defun
+ 
+-@defunx color:e-srgb 12 r g b
++@defun color:e-srgb 12 r g b
+ Returns the e-sRGB12 color composed of integers @var{r}, @var{g}, @var{b}.
++@end defun
+ 
+-@defunx color:e-srgb 16 r g b
++@defun color:e-srgb 16 r g b
+ Returns the e-sRGB16 color composed of integers @var{r}, @var{g}, @var{b}.
+ If the coordinates do not encode a valid e-sRGB color, then an error
+ is signaled.
+Index: slib/schmooz.scm
+===================================================================
+--- slib.orig/schmooz.scm
++++ slib/schmooz.scm
+@@ -306,22 +306,32 @@
+ 				  #\!))
+ 		     '("deffn {Procedure}" "deffnx {Procedure}" "deffn")
+ 		     '("defun" "defunx" "defun"))))))
++    (define in-body? #f)
+     (out-header args (car ops))
+     (let loop ((xdefs xdefs))
+       (cond ((pair? xdefs)
+ 	     (out-header (car xdefs) (cadr ops))
+ 	     (loop (cdr xdefs)))))
+     (for-each (lambda (subl)
++		;;(print 'in-body? in-body? 'subl subl)
+ 		(out 0 (car subl))
+ 		(for-each (lambda (l)
+ 			    (case (car l)
+ 			      ((@dfn)
+ 			       (out-cindex (cadr l)))
+ 			      ((@args)
+-			       (out-header
+-				(cons (car args) (cdr l))
+-				(cadr ops)))))
+-			  (cdr subl)))
++			       (cond
++				(in-body?
++				 (out 0 "@end " (caddr ops))
++				 (set! in-body? #f)
++				 (out-header (cons (car args) (cdr l))
++					     (car ops)))
++				(else
++				 (out-header (cons (car args) (cdr l))
++					     (cadr ops)))))))
++			  (cdr subl))
++		(if (not (equal? "" (car subl)))
++		    (set! in-body? #t)))
+ 	      (map (lambda (bl)
+ 		     (substitute-macs bl mac-list))
+ 		   body))
+@@ -344,9 +354,7 @@
+ 			      (else
+ 			       (report "bad macro" l))))
+ 			  (cdr subl)))
+-	      (map (lambda (bl)
+-		     (substitute-macs bl mac-list))
+-		   body))
++	      (map (lambda (bl) (substitute-macs bl mac-list)) body))
+     (out 0 "@end defvar")
+     (out 0)))
+ 
+Index: slib/grapheps.scm
+===================================================================
+--- slib.orig/grapheps.scm
++++ slib/grapheps.scm
+@@ -527,12 +527,12 @@
+ ;;over the range @2 to @3.  If the optional integer argument @4 is
+ ;;supplied, it specifies the number of points to evaluate @1 at.
+ ;;
+-;;@defunx x1 x2 npts func1 func2 ...
++;;@args x1 x2 npts func1 func2 ...
+ ;;Creates and displays an encapsulated PostScript graph of the
+ ;;one-argument functions @var{func1}, @var{func2}, ... over the range
+ ;;@var{x1} to @var{x2} at @var{npts} points.
+ ;;
+-;;@defunx plot coords x-label y-label
++;;@args coords x-label y-label
+ ;;@var{coords} is a list or vector of coordinates, lists of x and y
+ ;;coordinates.  @var{x-label} and @var{y-label} are strings with which
+ ;;to label the x and y axes.
diff --git a/debian/patches/712322_use_local_schmooz.patch b/debian/patches/712322_use_local_schmooz.patch
new file mode 100644
index 0000000..54a32b7
--- /dev/null
+++ b/debian/patches/712322_use_local_schmooz.patch
@@ -0,0 +1,21 @@
+Description: Use local schmooz version to build txi files
+ The generation of the txi files should be done using the copy of schmooz.scm
+ in the source, rather than the on from a previous slib version, that gets
+ installed on the system because scm depends on slib.
+Author: Ivo De Decker <ivodd@debian.org>
+Bug-Debian: http://bugs.debian.org/712322
+Forwarded: not-needed
+
+Index: slib/Makefile
+===================================================================
+--- slib.orig/Makefile
++++ slib/Makefile
+@@ -222,7 +222,7 @@ collectx.scm: collect.scm macwork.scm co
+ 	$(scheme) < collect.sc
+ 
+ $(txifiles):	$(txiscms) schmooz.scm
+-	$(scheme) -rschmooz -e'(schmooz "slib.texi")'
++	$(scheme) -f schmooz.scm -e'(schmooz "slib.texi")'
+ 
+ dvi:	slib.dvi
+ slib.dvi:	version.txi slib.texi $(txifiles) $(texifiles)
diff --git a/debian/patches/series b/debian/patches/series
index 4240963..2850442 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 debian-changes-3b1-3.1
+712322_fix_doc_build.patch
+712322_use_local_schmooz.patch