r5109 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2007-12-30 11:59:38 +0000 (Sun, 30 Dec 2007)
New Revision: 5109

Added:
   packages/trunk/warzone2100/debian/warzone2100-data.dirs
   packages/trunk/warzone2100/debian/warzone2100-data.install
   packages/trunk/warzone2100/debian/warzone2100.dirs
   packages/trunk/warzone2100/debian/warzone2100.docs
   packages/trunk/warzone2100/debian/warzone2100.install
Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/rules
Log:
* Install/build stuff in a more standard manner
* Install the new translations into the data package

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2007-12-30 10:28:35 UTC (rev 5108)
+++ packages/trunk/warzone2100/debian/changelog	2007-12-30 11:59:38 UTC (rev 5109)
@@ -16,6 +16,8 @@
   * Fix the watch file so it will match 2.1 but not rc versions
   * Only run ./configure once during the build process
   * Clean up the debian/rules clean target
+  * Install/build stuff in a more standard manner
+  * Install the new translations into the data package
 
  -- Paul Wise <pabs at debian.org>  Sat, 29 Dec 2007 10:32:03 +0930
 

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2007-12-30 10:28:35 UTC (rev 5108)
+++ packages/trunk/warzone2100/debian/rules	2007-12-30 11:59:38 UTC (rev 5109)
@@ -45,9 +45,7 @@
 
 build-stamp:
 	dh_testdir
-	$(MAKE) -C build_tools
-	$(MAKE) -C lib
-	$(MAKE) -C src
+	$(MAKE)
 	touch $@
 # -------------------------------------
 
@@ -59,6 +57,7 @@
 build-indep-stamp:
 	dh_testdir
 	$(MAKE) -C data data
+	$(MAKE) -C po
 	touch $@
 # -------------------------------------
 
@@ -85,9 +84,8 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
-	dh_install -i data/warzone.wz usr/share/games/warzone2100
-	dh_install -i data/mp.wz usr/share/games/warzone2100
+	$(MAKE) -C data install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C po install DESTDIR=$(CURDIR)/debian/tmp
 # -------------------------------------
 
 
@@ -97,8 +95,8 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
-	dh_install -a src/warzone2100 usr/games
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	rm -rf debian/tmp/usr/share/doc/warzone2100
 # -------------------------------------
 
 
@@ -107,8 +105,10 @@
 binary-indep: build-indep install-indep
 	dh_testdir -i
 	dh_testroot -i
+	dh_installdirs -i
+	dh_install -i --sourcedir=debian/tmp --list-missing
 	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i TODO
+	dh_installdocs -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -123,11 +123,10 @@
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
+	dh_installdirs -a
+	dh_install -a --sourcedir=debian/tmp --list-missing
 	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a TODO
-	dh_install -a debian/warzone2100-16x16.xpm /usr/share/pixmaps
-	dh_install -a debian/warzone2100-32x32.xpm /usr/share/pixmaps
-	dh_install -a icons/warzone2100.svg /usr/share/icons/hicolor/scalable/apps
+	dh_installdocs -a
 	dh_installmenu -a
 	dh_desktop -a
 	dh_installman -a debian/warzone2100.6

Added: packages/trunk/warzone2100/debian/warzone2100-data.dirs
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100-data.dirs	                        (rev 0)
+++ packages/trunk/warzone2100/debian/warzone2100-data.dirs	2007-12-30 11:59:38 UTC (rev 5109)
@@ -0,0 +1 @@
+usr/share/games

Added: packages/trunk/warzone2100/debian/warzone2100-data.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100-data.install	                        (rev 0)
+++ packages/trunk/warzone2100/debian/warzone2100-data.install	2007-12-30 11:59:38 UTC (rev 5109)
@@ -0,0 +1,2 @@
+usr/share/locale
+usr/share/games/warzone2100

Added: packages/trunk/warzone2100/debian/warzone2100.dirs
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.dirs	                        (rev 0)
+++ packages/trunk/warzone2100/debian/warzone2100.dirs	2007-12-30 11:59:38 UTC (rev 5109)
@@ -0,0 +1 @@
+usr/games

Added: packages/trunk/warzone2100/debian/warzone2100.docs
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.docs	                        (rev 0)
+++ packages/trunk/warzone2100/debian/warzone2100.docs	2007-12-30 11:59:38 UTC (rev 5109)
@@ -0,0 +1,4 @@
+AUTHORS
+TODO
+doc/Readme.en
+doc/Readme.de

Added: packages/trunk/warzone2100/debian/warzone2100.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.install	                        (rev 0)
+++ packages/trunk/warzone2100/debian/warzone2100.install	2007-12-30 11:59:38 UTC (rev 5109)
@@ -0,0 +1,7 @@
+usr/games
+usr/share/games/icons
+usr/share/games/applications
+../../debian/warzone2100-16x16.xpm usr/share/pixmaps
+../../debian/warzone2100-32x32.xpm usr/share/pixmaps
+../../icons/warzone2100.svg usr/share/icons/hicolor/scalable/apps
+