r10297 - in non-free/packages/trunk/assaultcube/debian: . patches patches/source patches/source/src

[Gonéri Le Bouder]

Author: goneri
Date: 2009-09-08 21:05:18 +0000 (Tue, 08 Sep 2009)
New Revision: 10297

Added:
   non-free/packages/trunk/assaultcube/debian/patches/
   non-free/packages/trunk/assaultcube/debian/patches/series
   non-free/packages/trunk/assaultcube/debian/patches/source/
   non-free/packages/trunk/assaultcube/debian/patches/source/src/
   non-free/packages/trunk/assaultcube/debian/patches/source/src/Makefile
Modified:
   non-free/packages/trunk/assaultcube/debian/rules
Log:
switch to dh7, patch for debian enet

Added: non-free/packages/trunk/assaultcube/debian/patches/series
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/series	                        (rev 0)
+++ non-free/packages/trunk/assaultcube/debian/patches/series	2009-09-08 21:05:18 UTC (rev 10297)
@@ -0,0 +1 @@
+source/src/Makefile

Added: non-free/packages/trunk/assaultcube/debian/patches/source/src/Makefile
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/source/src/Makefile	                        (rev 0)
+++ non-free/packages/trunk/assaultcube/debian/patches/source/src/Makefile	2009-09-08 21:05:18 UTC (rev 10297)
@@ -0,0 +1,55 @@
+--- assaultcube-1.0.4+repack1.orig/source/src/Makefile
++++ assaultcube-1.0.4+repack1/source/src/Makefile
+@@ -1,12 +1,12 @@
+ CXXOPTFLAGS=-O3 -fomit-frame-pointer
+-INCLUDES1=-I/usr/X11R6/include -I../enet/include -I../src
++INCLUDES1=-I/usr/X11R6/include -I../src
+ INCLUDES2=`sdl-config --cflags`
+ CXXCUSTOMFLAGS=-fsigned-char -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wpointer-arith -Wwrite-strings -Wconversion -rdynamic
+ CXXFLAGS=$(CXXOPTFLAGS) $(INCLUDES1) $(INCLUDES2) $(CUSTOMFLAGS)
+ CXXFLAGSSERVER=$(CXXOPTFLAGS) $(INCLUDES1) $(CUSTOMFLAGS)
+ 
+ PLATFORM_PREFIX=native
+-CLIENT_LIBS=-L/usr/X11R6/lib -L../enet -lenet `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile
++CLIENT_LIBS=-L/usr/X11R6/lib -lenet `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile
+ CLIENT_OBJS1= \
+ 	client.o \
+ 	clientgame.o \
+@@ -55,7 +55,7 @@
+ 	bot/ac_bot_ai.o 
+ 
+ 
+-SERVER_LIBS=-L../enet -lenet -lz
++SERVER_LIBS=-lenet -lz
+ SERVER_FILES= \
+ 	log.cpp \
+ 	serverms.cpp \
+@@ -66,13 +66,7 @@
+ 
+ default: all
+ 
+-all: libenet client server
+-
+-../enet/Makefile:
+-	cd ../enet; ./configure
+-
+-libenet: ../enet/Makefile
+-	-$(MAKE) -C ../enet all
++all: client server
+ 
+ clean:
+ 	-$(RM) -f $(SERVER_OBJS) $(CLIENT_OBJS1) ac_server ac_client
+@@ -80,12 +74,11 @@
+ 
+ mrproper: clean
+ 	-$(RM) -f $(CLIENT_OBJS2)
+-	-$(MAKE) -C ../enet/ clean
+ 
+ client: $(CLIENT_OBJS1) $(CLIENT_OBJS2)
+ 	$(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS1) $(CLIENT_OBJS2) $(CLIENT_LIBS)
+ 
+-server: libenet $(SERVER_FILES)
++server: $(SERVER_FILES)
+ 	$(CXX) $(CXXFLAGSSERVER) -o ac_server -DSTANDALONE $(SERVER_FILES) $(SERVER_LIBS)
+ 
+ install: all

Modified: non-free/packages/trunk/assaultcube/debian/rules
===================================================================
--- non-free/packages/trunk/assaultcube/debian/rules	2009-09-08 13:29:29 UTC (rev 10296)
+++ non-free/packages/trunk/assaultcube/debian/rules	2009-09-08 21:05:18 UTC (rev 10297)
@@ -1,32 +1,12 @@
 #!/usr/bin/make -f
 
-get-orig-source:
-	mkdir ../repack
-	uscan --force-download --destdir ../repack
-	( \
-		cd ../repack ;\
-		tar xf AssaultCube_v1.0.2.tar.bz2 ;\
-		rm -rf AssaultCube_v1.0.2/bin_unix ;\
-		rm -rf AssaultCube_v1.0.2/source ;\
-		GZIP="--best" tar -czf assaultcube-data_1.0.2+repack1.orig.tar.gz AssaultCube_v1.0.2 ;\
-		mv assaultcube-data_1.0.2+repack1.orig.tar.gz .. ;\
-	)
-	rm -rf ../repack
-
-
-build:
+override_dh_auto_build:
 	# nothing
 	cd source/src && $(MAKE)
 
-
-clean:
+override_dh_auto_install:
 	dh_testdir
 	dh_testroot
-	dh_clean 
-
-install:
-	dh_testdir
-	dh_testroot
 	dh_prep
 	dh_installdirs
 	install source/src/ac_client debian/assaultcube/usr/lib/games/assaultcube/client.bin
@@ -34,22 +14,5 @@
 	install debian/scripts/assaultcube debian/assaultcube/usr/games/assaultcube
 	install debian/scripts/assaultcube-server debian/assaultcube/usr/games/assaultcube-server
 
-binary-arch: build install
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installchangelogs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --with quilt $@