r3626 - packages/trunk/boswars/debian

[Cyril Brulebois]

Author: kibi-guest
Date: 2007-08-12 16:00:03 +0000 (Sun, 12 Aug 2007)
New Revision: 3626

Added:
   packages/trunk/boswars/debian/boswars-gl.menu
   packages/trunk/boswars/debian/boswars.menu
Removed:
   packages/trunk/boswars/debian/menu.ex
Modified:
   packages/trunk/boswars/debian/
   packages/trunk/boswars/debian/control
   packages/trunk/boswars/debian/rules
Log:
Add menu files, add a -gl package, add mergeWithUpstream property


Property changes on: packages/trunk/boswars/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: packages/trunk/boswars/debian/boswars-gl.menu
===================================================================
--- packages/trunk/boswars/debian/boswars-gl.menu	                        (rev 0)
+++ packages/trunk/boswars/debian/boswars-gl.menu	2007-08-12 16:00:03 UTC (rev 3626)
@@ -0,0 +1,2 @@
+?package(boswars):needs="X11" section="Games/Strategy"\
+  title="Bos Wars (OpenGL)" command="/usr/games/boswars-gl"

Added: packages/trunk/boswars/debian/boswars.menu
===================================================================
--- packages/trunk/boswars/debian/boswars.menu	                        (rev 0)
+++ packages/trunk/boswars/debian/boswars.menu	2007-08-12 16:00:03 UTC (rev 3626)
@@ -0,0 +1,2 @@
+?package(boswars):needs="X11" section="Games/Strategy"\
+  title="Bos Wars" command="/usr/games/boswars"

Modified: packages/trunk/boswars/debian/control
===================================================================
--- packages/trunk/boswars/debian/control	2007-08-12 15:24:02 UTC (rev 3625)
+++ packages/trunk/boswars/debian/control	2007-08-12 16:00:03 UTC (rev 3626)
@@ -14,8 +14,22 @@
  against human opponents over local network (LA), internet, or against the
  computer.
  .
+ This package includes the binary with OpenGL disabled.
+ .
   Homepage: http://www.boswars.org/
 
+Package: boswars-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, boswars-data (= ${source:Version})
+Description: futuristic real-time strategy game
+ Bos Wars is a futuristic real-time strategy game. It is possible to play
+ against human opponents over local network (LA), internet, or against the
+ computer.
+ .
+ This package includes the binary with OpenGL enabled.
+ .
+  Homepage: http://www.boswars.org/
+
 Package: boswars-data
 Architecture: all
 Description: futuristic real-time strategy game - data

Deleted: packages/trunk/boswars/debian/menu.ex
===================================================================
--- packages/trunk/boswars/debian/menu.ex	2007-08-12 15:24:02 UTC (rev 3625)
+++ packages/trunk/boswars/debian/menu.ex	2007-08-12 16:00:03 UTC (rev 3626)
@@ -1,2 +0,0 @@
-?package(boswars):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
-  title="boswars" command="/usr/bin/boswars"

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2007-08-12 15:24:02 UTC (rev 3625)
+++ packages/trunk/boswars/debian/rules	2007-08-12 16:00:03 UTC (rev 3626)
@@ -17,6 +17,7 @@
 export DH_OPTIONS
 
 DATA_DIR=/usr/share/games/boswars
+CCFLAGS=-DSTRATAGUS_LIB_PATH=\\\"/usr/share/games/boswars\\\"
 
 
 CFLAGS = -Wall -g
@@ -42,21 +43,25 @@
 build-arch-stamp: configure-stamp 
 	
 	# Add here commands to compile the arch part of the package.
-	scons CCFLAGS=-DSTRATAGUS_LIB_PATH=\\\"/usr/share/games/boswars\\\"
+	# With OpenGL
+	scons CCFLAGS=$(CCFLAGS) opengl=1
+	cp boswars boswars-gl
 	
+	# Without OpenGL
+	scons CCFLAGS=$(CCFLAGS) opengl=0
+	
 	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp 
 	
 	# Add here commands to compile the indep part of the package.
-	#$(MAKE) doc
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
 	
 	# Add here commands to clean up after the build process.
 	-scons -c
@@ -66,6 +71,9 @@
 	-rm -rf .sconf_temp
 	-rm config.log
 	
+	# Additional binary, see the two-pass build target.
+	-rm boswars-gl
+	
 	dh_clean 
 
 install: install-indep install-arch
@@ -97,7 +105,11 @@
 	install -d debian/boswars/usr/games
 	install boswars debian/boswars/usr/games
 	
+	install -d debian/boswars-gl/usr/games
+	install boswars-gl debian/boswars-gl/usr/games
+	
 	dh_install -s
+
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -106,29 +118,18 @@
 	dh_testroot
 	dh_installchangelogs CHANGELOG
 	dh_installdocs -XLICENSE.txt -XCOPYRIGHT.txt
-	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
+	dh_installmenu
 	dh_link
 	dh_strip
 	dh_compress 
 	dh_fixperms
-#	dh_perl
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+
 # Build architecture independant packages using the common target.
 binary-indep: build-indep install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common