r12358 - non-free/packages/trunk/assaultcube-data/debian

[Arand Nash]

Author: arand-guest
Date: 2011-05-14 20:27:27 +0000 (Sat, 14 May 2011)
New Revision: 12358

Modified:
   non-free/packages/trunk/assaultcube-data/debian/rules
Log:
Update rules, install server binaries

* get-orig-source no longer deletes the server binaries
  - repack2
* Install items package-dependent
* Install server binaries arch-dependent

Modified: non-free/packages/trunk/assaultcube-data/debian/rules
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/rules	2011-05-14 20:27:13 UTC (rev 12357)
+++ non-free/packages/trunk/assaultcube-data/debian/rules	2011-05-14 20:27:27 UTC (rev 12358)
@@ -6,9 +6,9 @@
 	( \
 		cd ../repack ;\
 		tar xf AssaultCube_v1.1.0.4.tar.bz2 ;\
-		rm -rf AssaultCube_v1.1.0.4/bin_unix ;\
-		GZIP="--best" tar -czf assaultcube-data_1.1.0.4+repack1.orig.tar.gz AssaultCube_v1.1.0.4 ;\
-		mv assaultcube-data_1.1.0.4+repack1.orig.tar.gz .. ;\
+		rm -rf AssaultCube_v1.1.0.4/bin_unix/*client ;\
+		GZIP="--best" tar -czf assaultcube-data_1.1.0.4+repack2.orig.tar.gz AssaultCube_v1.1.0.4 ;\
+		mv assaultcube-data_1.1.0.4+repack2.orig.tar.gz .. ;\
 	)
 	rm -rf ../repack
 
@@ -26,17 +26,27 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	dh_install config usr/share/games/assaultcube
-	dh_install packages usr/share/games/assaultcube
+	dh_install -passaultcube-data config usr/share/games/assaultcube
+	dh_install -passaultcube-data packages usr/share/games/assaultcube
+	dh_install
 	find debian/assaultcube-data -type f ! -name 'rules' -exec chmod 644 {} \;
 	find debian/assaultcube-data -name 'license.txt' -exec rm {} \;
 
+# We want to rename and install the arch-dependent server binaries
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 binary-arch: build install
+ifeq ($(DEB_HOST_ARCH),i386)
+	install -D bin_unix/linux_server usr/lib/games/assaultcube/ac_server-nonfree
+endif
+ifeq ($(DEB_HOST_ARCH),amd64)
+	install -D bin_unix/linux_server_64 usr/lib/games/assaultcube/ac_server-nonfree
+endif
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs docs README.html
+	dh_installdocs -passaultcube-data docs README.html
 	dh_installexamples
 	dh_installchangelogs
 	dh_strip