r6102 - packages/trunk/boswars/debian

[Cyril Brulebois]

Author: kibi-guest
Date: 2008-03-16 02:38:06 +0000 (Sun, 16 Mar 2008)
New Revision: 6102

Modified:
   packages/trunk/boswars/debian/boswars-data.install
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/rules
Log:
Minor tweaks to the build & install system. Follow upstream's renaming (video->intro).

Modified: packages/trunk/boswars/debian/boswars-data.install
===================================================================
--- packages/trunk/boswars/debian/boswars-data.install	2008-03-16 02:03:52 UTC (rev 6101)
+++ packages/trunk/boswars/debian/boswars-data.install	2008-03-16 02:38:06 UTC (rev 6102)
@@ -1,8 +1,8 @@
 campaigns usr/share/games/boswars
 graphics  usr/share/games/boswars
+intro     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

Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog	2008-03-16 02:03:52 UTC (rev 6101)
+++ packages/trunk/boswars/debian/changelog	2008-03-16 02:38:06 UTC (rev 6102)
@@ -26,6 +26,11 @@
        series is actually applied.
   * debian/control: Make the first long description only contain full
     sentences.
+  * debian/rules: Minor tweaks to the build system. Mostly: no longer ship
+    makesame.py and updatepo.sh, they're deleted from the target directory
+    along with genpot.sh.
+  * debian/boswars-data.install: Replace “video” with “intro” to follow
+    upstream's changes.
 
  -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Sat, 15 Mar 2008 23:16:12 +0100
 

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2008-03-16 02:03:52 UTC (rev 6101)
+++ packages/trunk/boswars/debian/rules	2008-03-16 02:38:06 UTC (rev 6102)
@@ -44,15 +44,15 @@
 	rm -f build-arch-stamp build-indep-stamp
 
 	# Add here commands to clean up after the build process.
-	-scons -c
-	-rm build_conf_cache.py
-	-rm build_options.py
-	-rm .sconsign.dblite
-	-rm -rf .sconf_temp
-	-rm config.log
+	scons -c
 
+	# Scons is stupid and leave them behind no matter what.
+	rm  -f .sconsign.dblite
+	rm -rf .sconf_temp
+	rm  -f build_conf_cache.py build_options.py config.log
+
 	# Additional icon (see build-indep-stamp)
-	-rm debian/boswars.png
+	rm  -f debian/boswars.png
 
 	dh_clean
 
@@ -64,6 +64,11 @@
 	dh_installdirs -i
 	dh_install -i
 
+	# Remove unneeded files.
+	for i in genpot.sh makesame.py updatepo.sh ; do \
+		rm -f debian/boswars-data/usr/share/games/boswars/languages/$$i ; \
+	done
+
 install-arch:
 	dh_testdir
 	dh_testroot
@@ -95,8 +100,6 @@
 
 # Build architecture independant packages using the common target.
 binary-indep: build-indep install-indep
-	rm -rf debian/boswars-data/usr/share/games/boswars/languages/genpot.sh
-
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.