Message-Id: <E1BcrbR-0001wf-LF@dual>
Date: Tue, 22 Jun 2004 20:10:45 +0000
From: Goswin von Brederlow <email address hidden>
To: Debian Bug Tracking System <email address hidden>
Subject: expect: Still some FTBFS issues

--===============8628175176606550272==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: expect
Version: 5.41.0-1
Severity: normal
Followup-For: Bug #255743

Hi,

the last patch was incomplete since it hits Bug #251641. The problem is
that autoconf screws up on the test. autoconf2.13 on the other hand work
fine.

This patch includes the last one as well as a Build-Depends on autoconf2.13
and a touch configure.in (so it gets rebuild correctly all the time).

MfG
	Goswin

-- System Information:
Debian Release: testing/unstable
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.5-amd64
Locale: LANG=C, LC_CTYPE=C

--===============8628175176606550272==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="expect_5.41.0-1.0.0.2.pure64.patch"

diff -Nurd expect-5.41.0.deb/debian/changelog expect-5.41.0/debian/changelog
--- expect-5.41.0.deb/debian/changelog	2004-06-22 19:57:29.279880009 +0000
+++ expect-5.41.0/debian/changelog	2004-06-22 19:57:38.437344388 +0000
@@ -1,3 +1,16 @@
+expect (5.41.0-1.0.0.2.pure64) unstable; urgency=low
+
+  * Change Build-Depend autoconf -> autoconf2.13
+  * touch configure.in so it gets rebuild
+
+ -- Goswin von Brederlow <email address hidden>  Tue, 22 Jun 2004 20:25:32 +0200
+
+expect (5.41.0-1.0.0.1.pure64) unstable; urgency=low
+
+  * Port to autotools-dev
+
+ -- Goswin von Brederlow <email address hidden>  Tue, 22 Jun 2004 20:25:32 +0200
+
 expect (5.41.0-1) unstable; urgency=low
 
   * New upstream version (Closes: #251637, #251641)
diff -Nurd expect-5.41.0.deb/debian/control expect-5.41.0/debian/control
--- expect-5.41.0.deb/debian/control	2004-06-22 19:57:29.279880009 +0000
+++ expect-5.41.0/debian/control	2004-06-22 19:57:38.437344388 +0000
@@ -2,7 +2,7 @@
 Section: interpreters
 Priority: optional
 Maintainer: Mike Markley <email address hidden>
-Build-Depends: debhelper (>= 3.0), autoconf, tcl8.4-dev, tk8.4-dev
+Build-Depends: debhelper (>= 3.0), autoconf2.13, tcl8.4-dev, tk8.4-dev, autotools-dev
 Standards-Version: 3.6.1.0
 
 Package: expect
diff -Nurd expect-5.41.0.deb/debian/rules expect-5.41.0/debian/rules
--- expect-5.41.0.deb/debian/rules	2004-06-22 19:57:29.280879842 +0000
+++ expect-5.41.0/debian/rules	2004-06-22 19:57:38.437344388 +0000
@@ -25,6 +25,11 @@
 configure-stamp:
 	dh_testdir
 
+	[ -f config.sub.orig ] || mv config.sub config.sub.orig
+	[ -f config.guess.orig ] || mv config.guess config.guess.orig
+	cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
+	touch configure.in
+
 	./configure --prefix=/usr --includedir=/usr/include/tcl$(tcltk) \
 	  --mandir=/usr/share/man --enable-shared \
 	  --with-tcl=/usr/lib/tcl$(tcltk) --with-tk=/usr/lib/tk$(tcltk) \
@@ -50,6 +55,9 @@
 	-$(MAKE) clean
 	-$(MAKE) distclean
 
+	if [ -f config.sub.orig ]; then mv config.sub.orig config.sub; fi
+	if [ -f config.guess.orig ]; then mv config.guess.orig config.guess; fi
+
 	dh_clean pkgIndex
 
 install: install-stamp

--===============8628175176606550272==--