[Pkg-octave-commit] [SCM] octave branch, octave3.2, updated. 1c6ef919588be746eb1f50d12b49366ca3a00070

[Rafael Laboissiere]

The following commit has been merged in the octave3.2 branch:
commit 1c6ef919588be746eb1f50d12b49366ca3a00070
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue May 26 22:23:38 2009 +0200

    Call autoconf and autoheader  explicitly in configure-stamp rule
    
    Do this instead of calling autogen.sh, otherwise autoconf/autoheader will be
    run inside one of the directories under .pc, which contain a copy of
    configure.in after "quilt push" is run, producing extraneous files in the
    quilt administrative area.

diff --git a/debian/changelog b/debian/changelog
index 687f9a2..530e3bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 octave3.2 (3.2.0~rc3-1) UNRELEASED; urgency=low
 
   * New upstream release candidate.
+  * debian/rules (configure-stamp): Instead of calling autogen.sh, call
+    explicitly autoconf and autoheader, otherwise these autotools will be
+    run inside one of the directories under .pc, which contain a copy of
+    configure.in after "quilt push" is run.
 
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 25 May 2009 10:43:29 +0200
 
diff --git a/debian/rules b/debian/rules
index 0fd7a3f..50535f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -158,7 +158,8 @@ configure: maintainer-scripts save-files patch configure-stamp
 configure-stamp:
 	dh_testdir
 
-	[ -f autogen.sh ] &&  ./autogen.sh && chmod 0755 configure
+	autoconf --force
+	autoheader --force
 
 	# Patch desktop file such that the referenced command exists
 	-test -f examples/octave.desktop.in				\

-- 
octave