[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-33-g855d6ce

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 00722912b7711689407c0a3065da0f76cf2f62da
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 17 12:44:20 2010 +0100

    Use Debhelper to install stuff

diff --git a/debian/rules b/debian/rules
index 58ee2e2..7934b86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,57 +22,9 @@ build clean: %:
 
 override_dh_auto_build:
 	$(MAKE) $(BUILD_FLAGS)
-
-install: install-indep install-arch
-
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-	dh_install -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-
 	cp build/release-linux-$(Q3ARCH)/tremulous.$(Q3ARCH) build/release-linux-$(Q3ARCH)/tremulous
 	cp build/release-linux-$(Q3ARCH)/tremded.$(Q3ARCH) build/release-linux-$(Q3ARCH)/tremded
-
-
-	### Client files
-	dh_install -ptremulous debian/scripts/tremulous usr/games
-	dh_install -ptremulous build/release-linux-$(Q3ARCH)/tremulous \
-		   usr/lib/tremulous
-
-#	dh_install -ptremulous build/release-linux-$(Q3ARCH)/base/cgame$(Q3ARCH).so \
-#		   build/release-linux-$(Q3ARCH)/base/game$(Q3ARCH).so \
-#		   build/release-linux-$(Q3ARCH)/base/ui$(Q3ARCH).so \
-#		   usr/lib/tremulous
-
-	dh_install -ptremulous debian/tremulous.desktop usr/share/applications # FIXME: waiting for dh_desktop to do this job...
-	dh_install -ptremulous debian/tremulous.xpm usr/share/pixmaps
-
-	dh_desktop -ptremulous debian/tremulous.desktop
-	dh_installman -ptremulous debian/tremulous.6
-
-	### Server files
-	dh_install -ptremulous-server debian/scripts/tremulous-server usr/games
-	dh_install -ptremulous-server build/release-linux-$(Q3ARCH)/tremded usr/lib/tremulous-server
-
-	dh_install -ptremulous-server debian/config/*.cfg etc/tremulous-server
-	#dh_install -ptremulous-server debian/tremulous-server.desktop usr/share/applications # FIXME: waiting for dh_desktop to do this job...
-	#dh_install -ptremulous-server debian/tremulous.xpm usr/share/pixmaps
-
-	# this would normally be in a .pk3 in tremulous-data...
 	zip -9 debian/z-debian-tremulous-ui-fixes.pk3 ui/joinserver.menu
-	dh_install -ptremulous debian/z-debian-tremulous-ui-fixes.pk3 usr/share/games/tremulous/base
-
-	dh_installman -ptremulous-server debian/tremulous-server.6
-
-	dh_install -s
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
diff --git a/debian/tremulous-server.install b/debian/tremulous-server.install
new file mode 100644
index 0000000..63347e4
--- /dev/null
+++ b/debian/tremulous-server.install
@@ -0,0 +1,3 @@
+debian/scripts/tremulous-server         usr/games
+build/release-*/tremded                 usr/lib/tremulous-server
+debian/config/*.cfg                     etc/tremulous-server
diff --git a/debian/tremulous-server.manpages b/debian/tremulous-server.manpages
new file mode 100644
index 0000000..fe5b764
--- /dev/null
+++ b/debian/tremulous-server.manpages
@@ -0,0 +1 @@
+debian/tremulous-server.6
diff --git a/debian/tremulous.install b/debian/tremulous.install
new file mode 100644
index 0000000..6232338
--- /dev/null
+++ b/debian/tremulous.install
@@ -0,0 +1,5 @@
+debian/scripts/tremulous                usr/games
+build/release-*/tremulous               usr/lib/tremulous
+debian/tremulous.desktop                usr/share/applications
+debian/tremulous.xpm                    usr/share/pixmaps
+debian/z-debian-tremulous-ui-fixes.pk3  usr/share/games/tremulous/base
diff --git a/debian/tremulous.manpages b/debian/tremulous.manpages
new file mode 100644
index 0000000..5b9f68f
--- /dev/null
+++ b/debian/tremulous.manpages
@@ -0,0 +1 @@
+debian/tremulous.6

-- 
team based FPS game - packaging