[fenix] 91/127: Use dh --with autotools_dev to handle config.guess and config.sub.

[Peter Pentchev]

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

roam-guest pushed a commit to branch master
in repository fenix.

commit 9f700df22ad3ca46152a7ba7e526e2dcdbae935a
Author: Peter Pentchev <roam at ringlet.net>
Date:   Thu Nov 25 22:49:25 2010 +0000

    Use dh --with autotools_dev to handle config.guess and config.sub.
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 11 ++---------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bddad3b..80ee1fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ fenix (0.92a.dfsg1-6) UNRELEASED; urgency=low
     the Debian packaging files.
   * Bump the debhelper compatibility level to 7:
     - shorten the rules file using the dh(1) helper
+    - use "dh --with autotools_dev" to handle config.guess and config.sub
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 13:25:18 +0200
 
diff --git a/debian/control b/debian/control
index 7866903..3aeeabd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7), autotools-dev,
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.8), autotools-dev (>= 20100122.1~),
  libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, libgif-dev, libpng12-dev,
  libsmpeg-dev, libmikmod2-dev, libvorbis-dev
 Standards-Version: 3.9.1
diff --git a/debian/rules b/debian/rules
index 74adf42..6f2be99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,13 +18,7 @@ CFLAGS += -DUSE_GETTEXT
 
 build: build-stamp
 build-stamp:  configure
-	dh build --before auto_configure
-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 build --before auto_configure --with autotools_dev
 	chmod +x configure
 	dh_auto_configure -- \
 		--enable-fxc \
@@ -44,8 +38,7 @@ clean:
 	dh clean --before auto_clean
 	dh_auto_clean
 	$(MAKE) -C debian/i18n clean
-	rm -f config.sub config.guess
-	dh clean --remaining
+	dh clean --remaining --with autotools_dev
 
 install: build
 	dh $@ --before auto_install

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