r11500 - packages/trunk/fenix/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-25 22:49:25 +0000 (Thu, 25 Nov 2010)
New Revision: 11500

Modified:
   packages/trunk/fenix/debian/changelog
   packages/trunk/fenix/debian/control
   packages/trunk/fenix/debian/rules
Log:
Use dh --with autotools_dev to handle config.guess and config.sub.


Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog	2010-11-25 22:31:14 UTC (rev 11499)
+++ packages/trunk/fenix/debian/changelog	2010-11-25 22:49:25 UTC (rev 11500)
@@ -18,6 +18,7 @@
     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
 

Modified: packages/trunk/fenix/debian/control
===================================================================
--- packages/trunk/fenix/debian/control	2010-11-25 22:31:14 UTC (rev 11499)
+++ packages/trunk/fenix/debian/control	2010-11-25 22:49:25 UTC (rev 11500)
@@ -3,7 +3,7 @@
 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

Modified: packages/trunk/fenix/debian/rules
===================================================================
--- packages/trunk/fenix/debian/rules	2010-11-25 22:31:14 UTC (rev 11499)
+++ packages/trunk/fenix/debian/rules	2010-11-25 22:49:25 UTC (rev 11500)
@@ -18,13 +18,7 @@
 
 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 @@
 	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