tag 424124 patch thanks The following patch makes the build run correctly after debian/rules clean.
I took the approach of adding a build-depend on autotools-dev and
copying config.{sub,guess} at build time instead of the more
complicated of trying to save/restore them after running autoconf.
*******************************************************************
diff -r 207e75b57b1b -r 2a154aa7cfad debian/control
--- a/debian/control Thu Jul 19 23:55:54 2007 -0500
+++ b/debian/control Fri Jul 20 00:11:38 2007 -0500
@@ -3,7 +3,7 @@ Priority: optional
Priority: optional
Maintainer: KELEMEN Peter <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
-Build-Depends: libncurses5-dev, debhelper (>= 4.0.0), autoconf
+Build-Depends: libncurses5-dev, debhelper (>= 4.0.0), autoconf, autotools-dev
Package: whowatch
Architecture: any
diff -r 207e75b57b1b -r 2a154aa7cfad debian/rules
--- a/debian/rules Thu Jul 19 23:55:54 2007 -0500
+++ b/debian/rules Fri Jul 20 00:11:38 2007 -0500
@@ -27,7 +27,9 @@ config.status: configure
config.status: configure
dh_testdir
# Using -O2 makes the thing segfault (gcc 4.1.2), I have no time to
look.
- rm config.sub config.guess
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
+
CFLAGS="-g -O0" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
build: patch-stamp build-stamp
@@ -47,7 +49,7 @@ patch-stamp:
unpatch-stamp:
if [ -f patch-stamp ]; then patch -R -p1 < debian/whowatch-1.6.0.patch;
rm patch-stamp; fi
- rm configure
+ rm -f configure
clean: unpatch-stamp
dh_testdir
@@ -56,11 +58,10 @@ clean: unpatch-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
+ # Remove these files so they don't end up in the .diff,
+ # they'll be overwriten at build time, anyway.
+ rm -f config.sub config.guess
dh_clean
*******************************************************************
signature.asc
Description: Digital signature
