[Pkg-octave-commit] [SCM] octave branch, master, updated. 30e53a40e341ea321ec99d8ed2bedc1b1c010965

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 30e53a40e341ea321ec99d8ed2bedc1b1c010965
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat Jun 6 20:55:00 2009 +0200

    Explicitly build the doc/conf.texi file

diff --git a/debian/changelog b/debian/changelog
index 01a628c..908d171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ octave3.2 (3.2.0-1) UNRELEASED; urgency=low
     + Do not generate debian/copyright from the file in debian/in/
     + In this new upstream version, doc/conf.texi is not distribute in the
       tarball.  Include it optionally in the savefiles list, accordingly.
+    + (make-arch): Explicitly build the doc/conf.texi file
   * debian/in/control: Fix minimal version of octave-optiminterp in the
     Breaks field
 
diff --git a/debian/rules b/debian/rules
index fd53fdd..aa6d9d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -213,6 +213,7 @@ configure-stamp:
 make-arch: configure-stamp make-arch-stamp
 make-arch-stamp:
 
+	make -C doc conf.texi
 	ln -fs octMakefile-no-doc octMakefile
 	$(MAKE)		CFLAGS="$(compilerflags)"		\
 			CXXFLAGS="$(compilerflags)"		\

-- 
octave