[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-5+exp1-4-g315c454

[Simon McVittie]

The following commit has been merged in the master branch:
commit 315c454bf56458fa89a364dddbdfcb7a6fe5aed0
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Nov 11 22:47:38 2010 +0000

    Depend on debhelper 8 and convert the rules file to dh style
    
    This means the init script actually gets installed...

diff --git a/debian/changelog b/debian/changelog
index 7625af3..847db2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openarena (0.8.5-5+exp2) UNRELEASED; urgency=low
     (Closes: #503106)
   * Add a README.Debian explaining alternative ways to run the server
   * Depend on an ioquake3-server new enough to have q3arch.sh, and use it
+  * Depend on debhelper 8 and convert the rules file to dh style
 
  -- Simon McVittie <smcv at debian.org>  Thu, 11 Nov 2010 20:13:30 +0000
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index ee85b7c..b83aa26 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Gonéri Le Bouder <goneri at rulezlan.org>,
            Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8),
                libsdl1.2-dev,
                libopenal-dev,
                imagemagick,
diff --git a/debian/openarena-server.manpages b/debian/openarena-server.manpages
new file mode 100644
index 0000000..2f20e0c
--- /dev/null
+++ b/debian/openarena-server.manpages
@@ -0,0 +1 @@
+debian/openarena-server.6
diff --git a/debian/openarena.manpages b/debian/openarena.manpages
new file mode 100644
index 0000000..0c433fb
--- /dev/null
+++ b/debian/openarena.manpages
@@ -0,0 +1 @@
+debian/openarena.6
diff --git a/debian/rules b/debian/rules
index 4a6dd1f..4415853 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,46 +59,34 @@ GAME_081_OPTIONS = \
 	BUILD_DIR=build-0.8.1-compat \
 	OPENARENA_081_COMPATIBLE=1
 
-build: build-stamp debian/scripts/openarena debian/scripts/openarena-server
-build-stamp:
-	dh_testdir
+%:
+	dh $@
+
+override_dh_auto_build:
 	$(MAKE) -C game $(GAME_OPTIONS) $(TARGET)
 	$(MAKE) -C game $(GAME_081_OPTIONS) $(TARGET)
-	touch $@
-
-debian/scripts/openarena: debian/scripts/openarena.in
-	install -d build
 	sed \
 		-e 's!@IOQ3BINARY@!ioquake3!' \
 		-e 's!@IOQ3SELF@!openarena!' \
 		-e 's!@IOQ3ROLE@!client!' \
-		< $< > $@
-	chmod +x $@
-
-debian/scripts/openarena-server: debian/scripts/openarena.in
-	install -d build
+		< debian/scripts/openarena.in > debian/scripts/openarena
 	sed \
 		-e 's!@IOQ3BINARY@!ioq3ded!' \
 		-e 's!@IOQ3SELF@!openarena-server!' \
 		-e 's!@IOQ3ROLE@!server!' \
-		< $< > $@
-	chmod +x $@
+		< debian/scripts/openarena.in > debian/scripts/openarena-server
+	chmod +x debian/scripts/openarena
+	chmod +x debian/scripts/openarena-server
 
-clean:
-	dh_testdir
-	dh_testroot
+override_dh_auto_clean:
 	rm -f build-stamp
 	rm -rf game/build
 	rm -rf game/build-0.8.1-compat
 	rm -f debian/openarena32.xpm
 	rm -f debian/scripts/openarena
 	rm -f debian/scripts/openarena-server
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
+override_dh_auto_install:
 	install -d debian/tmp/usr/games
 	install -d debian/tmp/usr/lib/games/openarena/baseoa/pak0/
 	install -d debian/tmp/usr/lib/games/openarena/missionpack/
@@ -109,30 +97,3 @@ install: build
 	install -m644 game/build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
 		debian/tmp/usr/lib/games/openarena/missionpack/
 	convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm
-	dh_install
-	dh_installdirs
-
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_link
-	dh_installmenu
-	dh_installchangelogs
-	dh_installman -popenarena debian/openarena.6
-	dh_installman -popenarena-server debian/openarena-server.6
-	dh_icons -popenarena
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

-- 
Packaging for the OpenArena engine