Bug#457961: Dillo failing to unpatch
Hi!
On Dec 27, 2007 5:18 PM, Patrick Schoenfeld
<schoenfeld@in-medias-res.com> wrote:
> Bart Martens has added a patch for this on the BTS. I'm not sure if his
> fix is appropriate, but he also indicates that he fixes
> config.{sub,guess}.
It seems OK.
Building fine with it.
But I would move the original config.{sub,guess} inside the
clean-patched target and not on the install. See the attached diff.
Best regards,
Nelson
diff -u dillo-0.8.6/debian/rules dillo-0.8.6/debian/rules
--- dillo-0.8.6/debian/rules
+++ dillo-0.8.6/debian/rules
@@ -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
@@ -55,6 +58,8 @@
-rm -f `find . -name "*.o"` `find . -name "*.dpi"` `find . -name "*.a"`
-rm -f `find . -name "*.gmo"` src/dillo dpid/dpid config/dillocfg
[ ! -f Makefile ] || $(MAKE) clean
+ [ ! -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
dh_clean
install: build
@@ -66,7 +71,6 @@
# Install lintian overrides
install -m644 -D debian/dillo.lintian-overrides $(CURDIR)/debian/dillo/usr/share/lintian/overrides/dillo
-
binary-indep: build install
binary-arch: build install
dh_testdir
Reply to: