r1187 - packages/trunk/scorched3d/debian

[Reinhard Tartler]

Author: siretart-guest
Date: 2006-07-26 13:29:38 +0000 (Wed, 26 Jul 2006)
New Revision: 1187

Modified:
   packages/trunk/scorched3d/debian/changelog
   packages/trunk/scorched3d/debian/control
   packages/trunk/scorched3d/debian/rules
Log:
new upstream version. update changelog, and run autofoo on the buildds


Modified: packages/trunk/scorched3d/debian/changelog
===================================================================
--- packages/trunk/scorched3d/debian/changelog	2006-07-26 13:28:45 UTC (rev 1186)
+++ packages/trunk/scorched3d/debian/changelog	2006-07-26 13:29:38 UTC (rev 1187)
@@ -1,3 +1,20 @@
+scorched3d (40-1) UNRELEASED; urgency=low
+
+  * 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:
+  * dropping 04netint patch 
+  * dropping 06_strxxx.dpatch
+  * dropping 10_gcc4.1.dpatch
+  * dropping 07_opengl-without-context
+  * dropping 08_XML-injection.
+  * dropping 09_HTML-injection
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 Jul 2006 15:24:21 +0200
+
 scorched3d (39.1+cvs20050929-3) UNRELEASED; urgency=low
 
   [ Gonéri Le Bouder ]

Modified: packages/trunk/scorched3d/debian/control
===================================================================
--- packages/trunk/scorched3d/debian/control	2006-07-26 13:28:45 UTC (rev 1186)
+++ packages/trunk/scorched3d/debian/control	2006-07-26 13:29:38 UTC (rev 1187)
@@ -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, dpatch, sharutils
+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-Conflicts: nvidia-glx
 Standards-Version: 3.7.0
 

Modified: packages/trunk/scorched3d/debian/rules
===================================================================
--- packages/trunk/scorched3d/debian/rules	2006-07-26 13:28:45 UTC (rev 1186)
+++ packages/trunk/scorched3d/debian/rules	2006-07-26 13:29:38 UTC (rev 1187)
@@ -14,19 +14,29 @@
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+$(info Disable all  optimisations)
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
+$(info Normal build, stripping binaries)
+else
+$(info Building DEBUG Version, do not strip binaries)
 endif
 
-config.status: configure
+config.status:
 	dh_testdir
 
-	cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(INSTALL_PROGRAM)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games/scorched3d --with-docdir=/usr/share/doc/scorched3d --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	chmod +x autogen.sh
+	CFLAGS="$(CFLAGS)" \
+	./autogen.sh \
+		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --bindir=\$${prefix}/games \
+		--datadir=\$${prefix}/share/games/scorched3d \
+		--with-docdir=/usr/share/doc/scorched3d \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info
 
 build: patch-stamp build-stamp 
 
@@ -41,10 +51,9 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
 	-$(MAKE) distclean
-
-	dh_clean config.sub config.guess debian/scorched3d.png
+	-find . -name Makefile.in -print | xargs rm -f
+	dh_clean config.sub config.guess debian/scorched3d.png config.status
 	dh_clean 
 
 install: build