[SCM] Packaging for bzflag branch, master, updated. upstream/2.0.16-61-g70bed9d

[Ryan Kavanagh]

The following commit has been merged in the master branch:
commit 48beb73811280b6b489c4e3c24dc1c33cdc23fe3
Author: Ryan Kavanagh <rak at debian.org>
Date:   Fri Jul 20 08:24:45 2012 -0400

    Move from an old-style dh_* rules to a dh7+ style rules

diff --git a/debian/bzflag-client.dirs b/debian/bzflag-client.dirs
new file mode 100644
index 0000000..0b72e13
--- /dev/null
+++ b/debian/bzflag-client.dirs
@@ -0,0 +1,3 @@
+usr/games
+usr/share/applications
+usr/share/pixmaps
diff --git a/debian/bzflag-client.install b/debian/bzflag-client.install
new file mode 100644
index 0000000..f36ebb6
--- /dev/null
+++ b/debian/bzflag-client.install
@@ -0,0 +1,3 @@
+src/bzflag/bzflag usr/games/
+data/bzflag.desktop usr/share/applications/
+data/bzflag-48x48.png usr/share/pixmaps/
diff --git a/debian/bzflag-client.manpages b/debian/bzflag-client.manpages
new file mode 100644
index 0000000..837f01f
--- /dev/null
+++ b/debian/bzflag-client.manpages
@@ -0,0 +1 @@
+man/bzflag.6
diff --git a/debian/bzflag-data.dirs b/debian/bzflag-data.dirs
new file mode 100644
index 0000000..ba24afc
--- /dev/null
+++ b/debian/bzflag-data.dirs
@@ -0,0 +1,2 @@
+usr/share/bzflag/l10n
+usr/share/bzflag/fonts
diff --git a/debian/bzflag-data.install b/debian/bzflag-data.install
new file mode 100644
index 0000000..3d448cd
--- /dev/null
+++ b/debian/bzflag-data.install
@@ -0,0 +1,3 @@
+data/[!CM]* usr/share/bzflag/
+data/l10n/[!CM]* usr/share/bzflag/l10n/
+data/fonts/[!CM]* usr/share/bzflag/fonts/
diff --git a/debian/bzflag-server.dirs b/debian/bzflag-server.dirs
new file mode 100644
index 0000000..47bc679
--- /dev/null
+++ b/debian/bzflag-server.dirs
@@ -0,0 +1,4 @@
+usr/games
+usr/lib/bzflag-server
+var/log/bzflag
+var/run/bzflag
diff --git a/debian/bzflag-server.examples b/debian/bzflag-server.examples
new file mode 100644
index 0000000..ddd23ff
--- /dev/null
+++ b/debian/bzflag-server.examples
@@ -0,0 +1 @@
+misc/maps/*.bzw
diff --git a/debian/bzflag-server.install b/debian/bzflag-server.install
new file mode 100644
index 0000000..090ae86
--- /dev/null
+++ b/debian/bzflag-server.install
@@ -0,0 +1,4 @@
+src/bzfs/bzfs usr/games
+src/bzadmin/bzadmin usr/games
+misc/bzfquery.pl usr/games/bzfquery
+plugins/*/.libs/*.so usr/lib/bzflag-server
diff --git a/debian/bzflag-server.manpages b/debian/bzflag-server.manpages
new file mode 100644
index 0000000..d3db61e
--- /dev/null
+++ b/debian/bzflag-server.manpages
@@ -0,0 +1,3 @@
+man/bzadmin.6
+man/bzfs.6
+man/bzw.5
diff --git a/debian/rules b/debian/rules
index e3becba..7cf0db6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,183 +16,22 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-debug
 endif
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+%:
+	dh $@
 
-	# Add here commands to compile the package.
-	# compile for i486 cause GL on i386 is hopeless
-	echo DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)
-	echo CONFIGURE_OPTS=$(CONFIGURE_OPTS)
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIGURE_OPTS)
 
-	./configure $(CONFIGURE_OPTS)
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-	dh_auto_clean
-
-	dh_clean
-
-install: build
-	#dh_testdir
-	#dh_testroot
-	#dh_prep
-	#dh_installdirs
-
-	# Add here commands to install the package into debian/<packagename>
-	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
-
-	#dh_movefiles
-
-# Build architecture-independent files here.
-binary-indep: build install bzflag bzflag-data
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install bzflag-client bzflag-server
-
-# "Target Specific Variable Values" seems to be broken, do it verbosely
-#bzflag: DH_OPTIONS = -pbzflag	# I ought to be able to do DH_OPTIONS=-p$@
-bzflag: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	#dh_installdirs -p$@ usr/games
-	#dh_installdebconf -p$@
-	dh_installdocs -p$@
-	#dh_installmenu -p$@
-	#dh_installmanpages -p$@
-	#dh_installinfo -p$@
-	#dh_undocumented -p$@
-	dh_installchangelogs -p$@ ChangeLog
-#ifneq (nostrip,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	#dh_strip -p$@
-#endif
-	#dh_link -p$@
-	dh_compress -p$@
-	dh_fixperms -p$@
-	dh_installdeb -p$@
-	#dh_makeshlibs -p$@
-	#dh_perl -p$@
-	#dh_shlibdeps -p$@
-	dh_gencontrol -p$@
-	dh_md5sums -p$@
-	dh_builddeb -p$@
-
-bzflag-client: DH_OPTIONS = -pbzflag-client
-bzflag-client: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs -p$@ usr/games usr/share/man/man6 usr/share/applications usr/share/pixmaps
-	# copy files into debian/$@/ here
-	cp -p src/bzflag/bzflag debian/$@/usr/games/
-	cp -p man/bzflag.6 debian/$@/usr/share/man/man6/
-	cp -p data/bzflag.desktop debian/$@/usr/share/applications/
-	cp -p data/bzflag-48x48.png debian/$@/usr/share/pixmaps/
-	#dh_installdebconf -p$@
-	dh_installdocs -p$@
-	dh_installmenu -p$@
-	#dh_installmanpages -p$@
-	dh_installinfo -p$@
-	#dh_undocumented -p$@
-	dh_installchangelogs -p$@ ChangeLog
-ifneq (nostrip,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	dh_strip -p$@
+override_dh_auto_install:
+	dh_installchangelogs ChangeLog
+ifneq (,$(findstring bzflag-server, $(shell dh_listpackages)))
+	misc/copyplugindocs debian/bzflag-server/usr/share/doc/bzflag-server/plugins/
+	dh_installinit -pbzflag-server --name=bzflag
 endif
-	dh_link -p$@
-	dh_compress -p$@
-	dh_fixperms -p$@
-	dh_installdeb -p$@
-	#dh_makeshlibs -p$@
-	#dh_perl -p$@
-	dh_shlibdeps -p$@
-	dh_gencontrol -p$@
-	dh_md5sums -p$@
-	dh_builddeb -p$@
-
-bzflag-data: DH_OPTIONS = -pbzflag-data
-bzflag-data: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs -p$@ usr/share/bzflag/l10n usr/share/bzflag/fonts
-	# copy files into debian/$@/ here
-	-cp -p data/[!CM]* debian/$@/usr/share/bzflag/
-	cp -p data/l10n/[!CM]* debian/$@/usr/share/bzflag/l10n/
-	cp -p data/fonts/[!CM]* debian/$@/usr/share/bzflag/fonts/
-	#dh_installdebconf -p$@
-	dh_installdocs -p$@
-	dh_installmenu -p$@
-	#dh_installmanpages -p$@
-	dh_installinfo -p$@
-	#dh_undocumented -p$@
-	dh_installchangelogs -p$@ ChangeLog
-#ifneq (nostrip,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-#	dh_strip -p$@
-#endif
-	#dh_link -p$@
-	dh_compress -p$@
-	dh_fixperms -p$@ -Xvar/log/bzflag -Xvar/run/bzflag
-	dh_installdeb -p$@
-	#dh_makeshlibs -p$@
-	#dh_perl -p$@
-	#dh_shlibdeps -p$@
-	dh_gencontrol -p$@
-	dh_md5sums -p$@
-	dh_builddeb -p$@
+	dh_auto_install
 
-bzflag-server: DH_OPTIONS = -pbzflag-server
-bzflag-server: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs -p$@ usr/games usr/share/man/man5 usr/share/man/man6 /usr/lib/$@ var/log/bzflag var/run/bzflag
-	# copy files into debian/$@/ here
-	cp -p man/*.5 debian/$@/usr/share/man/man5/
-	cp -p man/*.6 debian/$@/usr/share/man/man6/
-	rm debian/$@/usr/share/man/man6/bzflag.6
-	cp -p src/bzfs/bzfs src/bzadmin/bzadmin debian/$@/usr/games
-	cp -p misc/bzfquery.pl debian/$@/usr/games/bzfquery
-	chmod a+rx debian/$@/usr/games/bzfquery
-	chown -R games:games debian/$@/var/log/bzflag debian/$@/var/run/bzflag
-	cp -p plugins/*/.libs/*.so debian/$@/usr/lib/$@/
-	#dh_installdebconf -p$@
-	dh_installdocs -p$@
-	cp -p misc/maps/*.bzw debian/$@/usr/share/doc/$@/
-	misc/copyplugindocs debian/$@/usr/share/doc/$@/
-	dh_installexamples -p$@
-	dh_installmenu -p$@
-	#dh_installemacsen -p$@
-	#dh_installpam -p$@
-	dh_installinit -p$@ --name=bzflag
-	dh_installcron -p$@
-	#dh_installmanpages -p$@
-	dh_installinfo -p$@
-	#dh_undocumented -p$@ bzfquery.pl.6
-	dh_installchangelogs -p$@
-ifneq (nostrip,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	dh_strip -p$@
+override_dh_fixperms:
+	dh_fixperms
+ifneq (,$(findstring bzflag-server, $(shell dh_listpackages)))
+	chown -R games:games debian/bzflag-server/var/log/bzflag debian/bzflag-server/var/run/bzflag
 endif
-	dh_link -p$@
-	dh_compress -p$@
-	dh_fixperms -p$@
-	dh_installdeb -p$@
-	#dh_makeshlibs -p$@
-	#dh_perl -p$@
-	dh_shlibdeps -p$@
-	dh_gencontrol -p$@
-	dh_md5sums -p$@
-	dh_builddeb -p$@
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

-- 
Packaging for bzflag