Bug#457961: dillo fails to build twice in a row

[Patrick Schoenfeld]

Package: dillo
Severity: serious

Hi,

Nicolas reported that dillo fails to build twice in a row.
As this is considered an RC issue because beeing able to build twice in
a row is a release goal for lenny [1] I forward this to the BTS,
so that others can track this.

Best Regards

Patrick

[1] http://release.debian.org/lenny-goals.txt


- Forwarded message from Nicolas Valcarcel [EMAIL PROTECTED] -

From: Nicolas Valcarcel [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Date: Sat, 22 Dec 2007 00:05:05 -0500
Subject: problem unpatching dillo

I'm getting this error every time i debuild dillo for second time, and
as i see on the changelog you develop the patch, can you take a look on
it please?

$ debuild -rfakeroot
 fakeroot debian/rules clean
dpatch deapply-all
reverting patch 02_dont-ignore-hash-files from ./ ... ok.
reverting patch 01_i18n from ./ ... failed.
make: *** [unpatch] Error 1
debuild: fatal error at line 1247:
fakeroot debian/rules clean failed
-- 
aka nxvl
Peruvian LoCo Team
Key fingerprint = 8104 21CE A580 7EB7 5184  8DFF 6A3A D5DA 24DC 6AF5
gpg --keyserver keyserver.ubuntu.com --recv-keys 24DC6AF5



- End forwarded message -



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#457961: dillo: fails to build twice in a row - patch

[Bart Martens]

tags 457961 patch
stop


The attached patch should fix this bug.

diff -ruN orig/dillo-0.8.6/debian/rules dillo-0.8.6/debian/rules
--- orig/dillo-0.8.6/debian/rules	2007-12-27 18:59:20.0 +0100
+++ dillo-0.8.6/debian/rules	2007-12-27 19:27:32.0 +0100
@@ -23,6 +23,8 @@
 configure: config.status
 config.status: patch-stamp
 	dh_testdir
+	[ -f config.sub.d-r-orig ] || cp -p config.sub config.sub.d-r-orig
+	[ -f config.guess.d-r-orig ] || cp -p config.guess config.guess.d-r-orig
 ifneq $(wildcard /usr/share/misc/config.sub) 
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -45,7 +47,8 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -65,6 +68,8 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/dillo
 	# Install lintian overrides
 	install -m644 -D debian/dillo.lintian-overrides $(CURDIR)/debian/dillo/usr/share/lintian/overrides/dillo
+	[ ! -f config.sub.d-r-orig ] || mv config.sub.d-r-orig config.sub
+	[ ! -f config.guess.d-r-orig ] || mv config.guess.d-r-orig config.guess
 
 
 binary-indep: build install