r7271 - packages/trunk/desmume/debian

[Cyril Brulebois]

Author: kibi
Date: 2008-06-08 03:44:43 +0000 (Sun, 08 Jun 2008)
New Revision: 7271

Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/rules
Log:
Update config.{guess,sub} before configure, remove them in clean (Closes: #485033).

Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2008-06-08 03:40:22 UTC (rev 7270)
+++ packages/trunk/desmume/debian/changelog	2008-06-08 03:44:43 UTC (rev 7271)
@@ -3,6 +3,13 @@
   [ Ansgar Burchardt ]
   * debian/control: Remove Homepage semi-field from description
 
+  [ Cyril Brulebois ]
+  * Update config.{guess,sub} before running configure and remove them in
+    the clean target, instead of updating them in the clean target, so as
+    to keep the Debian diff clean, and also prevent an FTBFS with the new
+    “3.0 (quilt)” source package format, thanks to Raphaël Hertzog for the
+    notice (Closes: #485033).
+
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 10 May 2008 23:18:38 +0200
 
 desmume (0.8-1) unstable; urgency=low

Modified: packages/trunk/desmume/debian/rules
===================================================================
--- packages/trunk/desmume/debian/rules	2008-06-08 03:40:22 UTC (rev 7270)
+++ packages/trunk/desmume/debian/rules	2008-06-08 03:44:43 UTC (rev 7271)
@@ -22,6 +22,13 @@
 
 config.status: configure
 	dh_testdir
+	# Update config.{guess,sub}
+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
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
 		--bindir=/usr/games --datadir=/usr/share/games \
@@ -40,15 +47,8 @@
 	dh_testroot
 	rm -f build-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean config.guess config.sub
 
-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
-	dh_clean
-
 install: build
 	dh_testdir
 	dh_testroot