[dreamchess] 50/80: Update config.{guess, sub} before configure, remove them in clean (Closes: #484970 for real).

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository dreamchess.

commit f9c46facbd375cb7545e0a2fadde85948f79ea31
Author: Cyril Brulebois <kibi at debian.org>
Date:   Sun Jun 8 03:29:12 2008 +0000

    Update config.{guess,sub} before configure, remove them in clean (Closes: #484970 for real).
---
 debian/changelog |  8 ++++++--
 debian/rules     | 14 +++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b8fa1d..5f55719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 dreamchess (0.2.0-2) unstable; urgency=low
 
   * Remove “-p1” from debian/patches/series since it's useless and since
-    it might cause an FTBFS with the “3.0 (quilt)” source package format,
-    thanks to Raphaël Hertzog for the notice.
+    it might cause an FTBFS with the “3.0 (quilt)” source package format.
+  * Move config.{guess,sub} update from the clean target to the
+    config.status one, and remove them in clean target instead, so as to
+    keep the Debian diff clean and not to cause an FTBFS with the new
+    “3.0 (quilt)” source package format. Thanks to Raphaël Hertzog for the
+    notice (Closes: #484970).
 
  -- Cyril Brulebois <kibi at debian.org>  Sun, 08 Jun 2008 05:10:44 +0200
 
diff --git a/debian/rules b/debian/rules
index 5dece57..0809215 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,12 @@ endif
 config.status: configure
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
 	touch ChangeLog # Fix the incorrect date of this file
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=/usr/games --datadir=/usr/share/games
 
@@ -46,15 +52,9 @@ clean:
 	rm -f build-stamp 
 
 	[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -rf .pc
-	dh_clean 
+	dh_clean config.guess config.sub
 
 install: build
 	dh_testdir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dreamchess.git