r1220 - packages/trunk/scorched3d/debian

[Reinhard Tartler]

Author: siretart-guest
Date: 2006-07-27 08:36:16 +0000 (Thu, 27 Jul 2006)
New Revision: 1220

Modified:
   packages/trunk/scorched3d/debian/changelog
   packages/trunk/scorched3d/debian/control
   packages/trunk/scorched3d/debian/rules
Log:
don't run autohell on build for now, causes problems I will investigate later.
use special CFLAGS to work around build problems in va_snprintf


Modified: packages/trunk/scorched3d/debian/changelog
===================================================================
--- packages/trunk/scorched3d/debian/changelog	2006-07-26 22:50:17 UTC (rev 1219)
+++ packages/trunk/scorched3d/debian/changelog	2006-07-27 08:36:16 UTC (rev 1220)
@@ -2,7 +2,6 @@
 
   * new upstream version, merging old dpatches:
     + split old 64bit support dpatch in 'cast-fixes' and 'netserver-patches'
-  * adding build-depends on automake1.9 and autoconf, running at buildtime
   * added libogg-dev and libvorbis-dev to builddeps
   
   Dropping patches merged Upstream:

Modified: packages/trunk/scorched3d/debian/control
===================================================================
--- packages/trunk/scorched3d/debian/control	2006-07-26 22:50:17 UTC (rev 1219)
+++ packages/trunk/scorched3d/debian/control	2006-07-27 08:36:16 UTC (rev 1220)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev, libsdl-net1.2-dev, libopenal-dev, libalut-dev, libfreetype6-dev, libwxgtk2.6-dev, libgl1-mesa-dev, libglu1-mesa-dev, sharutils, automake1.9, autoconf, libogg-dev, dpatch
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev, libsdl-net1.2-dev, libopenal-dev, libalut-dev, libfreetype6-dev, libwxgtk2.6-dev, libgl1-mesa-dev, libglu1-mesa-dev, sharutils, libogg-dev, dpatch
 Build-Conflicts: nvidia-glx
 Standards-Version: 3.7.0
 

Modified: packages/trunk/scorched3d/debian/rules
===================================================================
--- packages/trunk/scorched3d/debian/rules	2006-07-26 22:50:17 UTC (rev 1219)
+++ packages/trunk/scorched3d/debian/rules	2006-07-27 08:36:16 UTC (rev 1220)
@@ -28,9 +28,9 @@
 config.status:
 	dh_testdir
 
-	chmod +x autogen.sh
-	CFLAGS="$(CFLAGS)" \
-	./autogen.sh \
+	# http://www.scorched3d.co.uk/phpBB2/viewtopic.php?p=22999
+	CFLAGS="$(CFLAGS) -D_GNU_SOURCE -DHAVE_VASPRINTF" \
+	./configure \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --bindir=\$${prefix}/games \
 		--datadir=\$${prefix}/share/games/scorched3d \
@@ -51,9 +51,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-	-$(MAKE) distclean
-	-find . -name Makefile.in -print | xargs rm -f
-	dh_clean config.sub config.guess debian/scorched3d.png config.status
+	-$(MAKE) clean
+	dh_clean debian/scorched3d.png config.status
 	dh_clean 
 
 install: build