summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2008-04-03 03:59:30 +0000
committerGuillem Jover <guillem@hadrons.org>2010-06-10 23:21:22 +0200
commit959f481d0954d243a8984954be0a4c0ef09d0ab3 (patch)
treea1b5d9a92933a70a78bfbe46c8b0a529538af1cc
parent6e5913a4ab5896e269a5f57e320757d9ef169c76 (diff)
downloadinetutils-959f481d0954d243a8984954be0a4c0ef09d0ab3.tar.gz
Fix FTBFS if built twice in a row
Call distclean instead of clean. Move the unpatch step from the clean dependency to the body, after the distclean call. Remove all files that autoreconf might have modified. Closes: #424419
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/rules12
2 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 46f8d55..6f8dd40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,11 @@ inetutils (2:1.5.dfsg.1-5) UNRELEASED; urgency=low
openbsd-inetd).
* Complete copyright information in debian/copyright file.
* Remove packaging svn information from debian/copyright.
+ * Fix FTBFS if built twice in a row: (Closes: #424419)
+ - Call distclean instead of clean.
+ - Move the unpatch step from the clean dependency to the body, after
+ the distclean call.
+ - Remove all files that autoreconf might have modified.
-- Guillem Jover <guillem@debian.org> Fri, 18 May 2007 07:37:19 +0300
diff --git a/debian/rules b/debian/rules
index 3b0a8ff..d68c218 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,11 +87,19 @@ else
> debian/control
endif
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ # Cleanup the mess after having run autoreconf ...
+ find -name Makefile.in | xargs rm -f
+ rm -f INSTALL aclocal.m4 config.hin configure
+ rm -rf build-aux
+
+ # This is here so that we don't try to go under doc/
+ $(MAKE) -f debian/rules unpatch
dh_clean