r4503 - packages/trunk/boswars/debian

[Barry deFreese]

Author: bddebian-guest
Date: 2007-10-31 04:00:10 +0000 (Wed, 31 Oct 2007)
New Revision: 4503

Added:
   packages/trunk/boswars/debian/boswars-data.dirs
   packages/trunk/boswars/debian/boswars-data.install
   packages/trunk/boswars/debian/boswars.dirs
   packages/trunk/boswars/debian/boswars.install
Modified:
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/rules
Log:
* Remove dh_make comments from rules file
* New files: debian/ boswars.{dirs,install}, boswars-data.{dirs,install}
* Call dh_desktop


Added: packages/trunk/boswars/debian/boswars-data.dirs
===================================================================
--- packages/trunk/boswars/debian/boswars-data.dirs	                        (rev 0)
+++ packages/trunk/boswars/debian/boswars-data.dirs	2007-10-31 04:00:10 UTC (rev 4503)
@@ -0,0 +1 @@
+usr/share/games/boswars

Added: packages/trunk/boswars/debian/boswars-data.install
===================================================================
--- packages/trunk/boswars/debian/boswars-data.install	                        (rev 0)
+++ packages/trunk/boswars/debian/boswars-data.install	2007-10-31 04:00:10 UTC (rev 4503)
@@ -0,0 +1,9 @@
+campaigns usr/share/games/boswars
+graphics usr/share/games/boswars
+languages usr/share/games/boswars
+maps usr/share/games/boswars
+scripts usr/share/games/boswars
+sounds usr/share/games/boswars
+units usr/share/games/boswars
+video usr/share/games/boswars
+

Added: packages/trunk/boswars/debian/boswars.dirs
===================================================================
--- packages/trunk/boswars/debian/boswars.dirs	                        (rev 0)
+++ packages/trunk/boswars/debian/boswars.dirs	2007-10-31 04:00:10 UTC (rev 4503)
@@ -0,0 +1,4 @@
+usr/games
+usr/share/doc/boswars/html
+usr/share/applications
+usr/share/pixmaps

Added: packages/trunk/boswars/debian/boswars.install
===================================================================
--- packages/trunk/boswars/debian/boswars.install	                        (rev 0)
+++ packages/trunk/boswars/debian/boswars.install	2007-10-31 04:00:10 UTC (rev 4503)
@@ -0,0 +1,4 @@
+./boswars usr/games
+doc/* usr/share/doc/boswars/html
+debian/boswars.desktop usr/share/applications
+

Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog	2007-10-31 02:24:50 UTC (rev 4502)
+++ packages/trunk/boswars/debian/changelog	2007-10-31 04:00:10 UTC (rev 4503)
@@ -11,5 +11,8 @@
   [ Barry deFreese ]
   * New upstream release
   * Add desktop file
+  * Remove dh_make comments from rules file
+  * New files: debian/ boswars.{dirs,install}, boswars-data.{dirs,install}
+  * Call dh_desktop
 
  -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Mon, 13 Aug 2007 14:35:55 +0200

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2007-10-31 02:24:50 UTC (rev 4502)
+++ packages/trunk/boswars/debian/rules	2007-10-31 04:00:10 UTC (rev 4503)
@@ -1,25 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
 DATA_DIR=/usr/share/games/boswars
 CCFLAGS=-DSTRATAGUS_LIB_PATH=\\\"/usr/share/games/boswars\\\"
 
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -42,8 +28,7 @@
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 	
-	# Compile without OpenGL at the moment, see changelog
-	scons CCFLAGS=$(CCFLAGS) opengl=0
+	scons CCFLAGS=$(CCFLAGS)
 	
 	touch $@
 
@@ -77,12 +62,6 @@
 	dh_clean -k -i 
 	dh_installdirs -i
 	
-	# Add here commands to install the indep part of the package
-	install -d debian/boswars-data/$(DATA_DIR)
-	for i in campaigns graphics languages maps scripts sounds units video; do \
-		cp -r $$i debian/boswars-data/$(DATA_DIR); \
-	done
-	
 	# Add a shebang
 	find debian/boswars-data -name genpot.sh \
 		-exec sed -i '1{s/^/#!\/bin\/sh\n\n/}' {} ';'
@@ -94,20 +73,7 @@
 	dh_testroot
 	dh_clean -k -s 
 	dh_installdirs -s
-	
-	# Add here commands to install the arch part of the package into 
-	# debian/tmp.
-	install -d debian/boswars/usr/games
-	install boswars debian/boswars/usr/games
 	dh_installman -pboswars debian/boswars.6
-	
-	# Install the documentation
-	install -d debian/boswars/usr/share/doc/boswars/html
-	cp -r doc/* debian/boswars/usr/share/doc/boswars/html
-
-	# Install the desktop file
-	install -D -m 644 debian/boswars.desktop debian/boswars/usr/share/applications/boswars.desktop
-	
 	dh_install -s
 
 # Must not depend on anything. This is to be called by