r11513 - in packages/trunk/fenix-plugins/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-26 13:19:07 +0000 (Fri, 26 Nov 2010)
New Revision: 11513

Added:
   packages/trunk/fenix-plugins/debian/patches/
   packages/trunk/fenix-plugins/debian/patches/01-fullclean.patch
   packages/trunk/fenix-plugins/debian/patches/series
Modified:
   packages/trunk/fenix-plugins/debian/changelog
   packages/trunk/fenix-plugins/debian/control
   packages/trunk/fenix-plugins/debian/rules
Log:
Use dh --with autotools_dev to handle config.guess and config.sub.


Modified: packages/trunk/fenix-plugins/debian/changelog
===================================================================
--- packages/trunk/fenix-plugins/debian/changelog	2010-11-26 10:03:30 UTC (rev 11512)
+++ packages/trunk/fenix-plugins/debian/changelog	2010-11-26 13:19:07 UTC (rev 11513)
@@ -1,7 +1,6 @@
 fenix-plugins (0.0.20070803-4) UNRELEASED; urgency=low
 
   TODO: debhelper: overrides, then 8
-  TODO: dh --with autotools_dev
   TODO: dpkg-buildflags
 
   [ Miriam Ruiz ]
@@ -29,6 +28,7 @@
   * Bump Standards-Version to 3.9.1 with no changes.
   * 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 16:09:06 +0200
 

Modified: packages/trunk/fenix-plugins/debian/control
===================================================================
--- packages/trunk/fenix-plugins/debian/control	2010-11-26 10:03:30 UTC (rev 11512)
+++ packages/trunk/fenix-plugins/debian/control	2010-11-26 13:19:07 UTC (rev 11513)
@@ -3,7 +3,8 @@
 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: debhelper (>= 7), autotools-dev, autoconf, automake1.10 | automake1.9,
+Build-Depends: debhelper (>= 7.0.8), autotools-dev (>= 20100122.1~),
+ autoconf, automake1.10 | automake1.9,
  zlib1g-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev,
  libsmpeg-dev, libfreetype6-dev, fenix, fenix-dev, libtool
 Standards-Version: 3.9.1

Added: packages/trunk/fenix-plugins/debian/patches/01-fullclean.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/01-fullclean.patch	                        (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/01-fullclean.patch	2010-11-26 13:19:07 UTC (rev 11513)
@@ -0,0 +1,16 @@
+Description: Adapt the "fullclean" target to the Debian build system.
+Forwarded: not-needed
+Author: Peter Pentchev <roam at ringlet.net>
+Last-Update: 2010-11-26
+
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@
+ 
+ fullclean: distclean
+ 	rm -f */aclocal.m4 */configure */Makefile.in
+-	rm -f */config.guess */config.sub */config.status */config.log
++	rm -f */config.status */config.log */ltmain.sh
+ 
+ distclean: clean_tests
+ 	@printf "\n == CLEAN: $@ ==\n\n"

Added: packages/trunk/fenix-plugins/debian/patches/series
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/series	                        (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/series	2010-11-26 13:19:07 UTC (rev 11513)
@@ -0,0 +1 @@
+01-fullclean.patch

Modified: packages/trunk/fenix-plugins/debian/rules
===================================================================
--- packages/trunk/fenix-plugins/debian/rules	2010-11-26 10:03:30 UTC (rev 11512)
+++ packages/trunk/fenix-plugins/debian/rules	2010-11-26 13:19:07 UTC (rev 11513)
@@ -19,11 +19,9 @@
 
 build: build-stamp
 build-stamp:
-	dh build --before auto_build
+	dh build --before auto_build --with autotools_dev
 	for i in */ ; do \
 		if [ -e "$$i/configure.ac" ]; then \
-			cp -f /usr/share/misc/config.sub "$$i/config.sub" ; \
-			cp -f /usr/share/misc/config.guess "$$i/config.guess" ; \
 			cp -f /usr/share/libtool/config/ltmain.sh "$$i/ltmain.sh" ; \
 		fi \
 	done
@@ -37,8 +35,7 @@
 clean:
 	dh $@ --before auto_clean
 	dh_auto_clean -- fullclean
-	rm -f */ltmain.sh
-	dh $@ --remaining
+	dh $@ --remaining --with autotools_dev
 
 install: build
 	dh $@