[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-21-g1eb4088

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 0a04a6418e3382b2bd143bafe37148816bfd5607
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Fri Oct 28 21:54:51 2011 -0400

    add permanent manpages

diff --git a/debian/changelog b/debian/changelog
index 4c66552..92079d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 minetest (0.2.20110731.3-2) unstable; urgency=low
 
   * Update watch file.
+  * Add permanent manpages.
   * Support parallel builds.
   * Remove vcs files in clean rule.
 
diff --git a/debian/minetest.1 b/debian/minetest.1
new file mode 100644
index 0000000..72184bb
--- /dev/null
+++ b/debian/minetest.1
@@ -0,0 +1,55 @@
+.TH MINETESTD "1" "October 2011" "minetest 0.2.20110731.3" "User Commands"
+.SH NAME
+minetest \- minetest game client
+.SH DESCRIPTION
+Allowed options:
+.HP
+\fB\-\-address\fR <value>
+.HP
+\fB\-\-config\fR <value>
+.IP
+Load configuration from specified file
+.HP
+\fB\-\-disable\-unittests\fR
+.HP
+\fB\-\-enable\-unittests\fR
+.HP
+\fB\-\-help\fR
+.HP
+\fB\-\-map\-dir\fR <value>
+.HP
+\fB\-\-port\fR <value>
+.HP
+\fB\-\-random\-input\fR
+.HP
+\fB\-\-server\fR
+.IP
+Run server directly
+.HP
+\fB\-\-speedtests\fR
+.SS "Allowed options:"
+.HP
+\fB\-\-address\fR <value>
+.HP
+\fB\-\-config\fR <value>
+.IP
+Load configuration from specified file
+.HP
+\fB\-\-disable\-unittests\fR
+.HP
+\fB\-\-enable\-unittests\fR
+.HP
+\fB\-\-help\fR
+.HP
+\fB\-\-map\-dir\fR <value>
+.HP
+\fB\-\-port\fR <value>
+.HP
+\fB\-\-random\-input\fR
+.HP
+\fB\-\-server\fR
+.IP
+Run server directly
+.HP
+\fB\-\-speedtests\fR
+.PP
diff --git a/debian/minetest.manpages b/debian/minetest.manpages
new file mode 100644
index 0000000..f138cef
--- /dev/null
+++ b/debian/minetest.manpages
@@ -0,0 +1,2 @@
+debian/minetest.1
+debian/minetestserver.1
diff --git a/debian/minetestserver.1 b/debian/minetestserver.1
new file mode 100644
index 0000000..7e34926
--- /dev/null
+++ b/debian/minetestserver.1
@@ -0,0 +1,36 @@
+.TH MINETESTSERVER "1" "October 2011" "minetestserver 0.2.20110731.3" "User Commands"
+.SH NAME
+minetestserver \- minetest game server
+.SH DESCRIPTION
+Allowed options:
+.HP
+\fB\-\-config\fR <value>
+.IP
+Load configuration from specified file
+.HP
+\fB\-\-disable\-unittests\fR
+.HP
+\fB\-\-enable\-unittests\fR
+.HP
+\fB\-\-help\fR
+.HP
+\fB\-\-map\-dir\fR <value>
+.HP
+\fB\-\-port\fR <value>
+.PP
+Allowed options:
+.HP
+\fB\-\-config\fR <value>
+.IP
+Load configuration from specified file
+.HP
+\fB\-\-disable\-unittests\fR
+.HP
+\fB\-\-enable\-unittests\fR
+.HP
+\fB\-\-help\fR
+.HP
+\fB\-\-map\-dir\fR <value>
+.HP
+\fB\-\-port\fR <value>
+.PP
diff --git a/debian/rules b/debian/rules
index 78bac56..458cdba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
 parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo -j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | grep processor | grep processor | wc -l || echo 1))
 
 override_dh_auto_clean:
@@ -31,13 +30,3 @@ override_dh_auto_build:
 
 %:
 	dh $@ 
-
-override_dh_auto_install:
-	dh_auto_install
-	mkdir -p debian/minetest/usr/share/man/man1
-	help2man --no-discard-stderr -N -n 'minetest game client' -v ${version} \
-	    ./debian/minetest/usr/games/minetest | \
-	    gzip -9 > debian/minetest/usr/share/man/man1/minetest.1.gz
-	help2man --no-discard-stderr -N -n 'minetest game server' -v ${version} \
-	    ./debian/minetest/usr/games/minetestserver | grep -v path_data | \
-	    gzip -9 > debian/minetest/usr/share/man/man1/minetestserver.1.gz

-- 
InfiniMiner/Minecraft-inspired open game world