[cyphesis-cpp] 06/08: Remove games-specific installation settings

Tue Sep 6 11:40:37 UTC 2016

This is an automated email from the git hooks/post-receive script.

olek-guest pushed a commit to branch master
in repository cyphesis-cpp.

commit 272b0ac15c026e1896cc8cda4fbf74351ef97eb1
Author: Olek Wojnar <olek-dev at wojnar.org>
Date:   Tue Aug 30 01:18:37 2016 -0400

    Remove games-specific installation settings
---
 debian/changelog                      |  4 +++-
 debian/cyphesis-cpp-clients.install   | 20 ++++++++++----------
 debian/cyphesis-cpp-clients.links     |  2 +-
 debian/cyphesis-cpp-clients.manpages  | 20 ++++++++++----------
 debian/cyphesis-cpp-mason.install     |  2 +-
 debian/cyphesis-cpp.init              |  8 ++++----
 debian/cyphesis-cpp.install           | 12 ++++++------
 debian/cyphesis-cpp.lintian-overrides |  4 ++++
 debian/cyphesis-cpp.manpages          |  2 +-
 debian/cyphesis-cpp.postinst          |  2 +-
 debian/rules                          |  5 +----
 11 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 345e4aa..2167ce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ cyphesis-cpp (0.6.2-1) unstable; urgency=medium
     -- Add remove-generated-file.patch
     -- Add update-for-wfmath-api-change.patch
   * Update dependencies
+  * Remove games-specific installation settings
+    -- Add lintian override
 
- -- Olek Wojnar <olek-dev at wojnar.org>  Mon, 29 Aug 2016 23:08:14 -0400
+ -- Olek Wojnar <olek-dev at wojnar.org>  Tue, 30 Aug 2016 01:11:34 -0400
 
 cyphesis-cpp (0.6.0-6) unstable; urgency=medium
 
diff --git a/debian/cyphesis-cpp-clients.install b/debian/cyphesis-cpp-clients.install
index 4636eac..607d1e1 100644
--- a/debian/cyphesis-cpp-clients.install
+++ b/debian/cyphesis-cpp-clients.install
@@ -1,10 +1,10 @@
-usr/games/cyaddrules
-usr/games/cyclient
-usr/games/cycmd
-usr/games/cyconfig
-usr/games/cyconvertrules
-usr/games/cydb
-usr/games/cydumprules
-usr/games/cyloadrules
-usr/games/cypasswd
-usr/games/cypython
+usr/bin/cyaddrules
+usr/bin/cyclient
+usr/bin/cycmd
+usr/bin/cyconfig
+usr/bin/cyconvertrules
+usr/bin/cydb
+usr/bin/cydumprules
+usr/bin/cyloadrules
+usr/bin/cypasswd
+usr/bin/cypython
diff --git a/debian/cyphesis-cpp-clients.links b/debian/cyphesis-cpp-clients.links
index ddf9a78..027692d 100644
--- a/debian/cyphesis-cpp-clients.links
+++ b/debian/cyphesis-cpp-clients.links
@@ -1 +1 @@
-usr/share/man/man6/cyphesis-tools.6.gz usr/share/man/man6/cyconfig.6.gz
+usr/share/man/man1/cyphesis-tools.1.gz usr/share/man/man1/cyconfig.1.gz
diff --git a/debian/cyphesis-cpp-clients.manpages b/debian/cyphesis-cpp-clients.manpages
index 2a00477..240f9d9 100644
--- a/debian/cyphesis-cpp-clients.manpages
+++ b/debian/cyphesis-cpp-clients.manpages
@@ -1,10 +1,10 @@
-man/cyaddrules.6
-man/cyclient.6
-man/cycmd.6
-man/cyconvertrules.6
-man/cydb.6
-man/cydumprules.6
-man/cyloadrules.6
-man/cypasswd.6
-man/cyphesis-tools.6
-man/cypython.6
+man/cyaddrules.1
+man/cyclient.1
+man/cycmd.1
+man/cyconvertrules.1
+man/cydb.1
+man/cydumprules.1
+man/cyloadrules.1
+man/cypasswd.1
+man/cyphesis-tools.1
+man/cypython.1
diff --git a/debian/cyphesis-cpp-mason.install b/debian/cyphesis-cpp-mason.install
index 0fd6f37..9665a01 100644
--- a/debian/cyphesis-cpp-mason.install
+++ b/debian/cyphesis-cpp-mason.install
@@ -1,2 +1,2 @@
 etc/cyphesis/mason.d/*
-usr/share/games/cyphesis/rulesets/mason/*
+usr/share/cyphesis/rulesets/mason/*
diff --git a/debian/cyphesis-cpp.init b/debian/cyphesis-cpp.init
index d8f1abc..405478c 100644
--- a/debian/cyphesis-cpp.init
+++ b/debian/cyphesis-cpp.init
@@ -18,7 +18,7 @@ if ! [ -f /etc/cyphesis/cyphesis.vconf ]; then
 	exit 0
 fi
 
-if ! [ -x /usr/games/cyphesis ]; then
+if ! [ -x /usr/bin/cyphesis ]; then
 	exit 0
 fi
 
@@ -27,7 +27,7 @@ fi
 case "$1" in
     start)
 		log_daemon_msg "Starting cyphesis games server"
-		if start-stop-daemon --start --quiet --oknodo --chuid Cyphesis --exec /usr/games/cyphesis -- --cyphesis:daemon=true 2>/dev/null ; then
+		if start-stop-daemon --start --quiet --oknodo --chuid Cyphesis --exec /usr/bin/cyphesis -- --cyphesis:daemon=true 2>/dev/null ; then
 			log_end_msg 0
 		else
 			log_end_msg 1
@@ -35,7 +35,7 @@ case "$1" in
 		;;
     stop)
 		log_daemon_msg "Stopping cyphesis games server"
-		PID=`ps ax | grep "/usr/games/cyphesi[s]" | awk '{print $1}'`
+		PID=`ps ax | grep "/usr/bin/cyphesi[s]" | awk '{print $1}'`
 		if [ -z "$PID" ] ; then
 			log_progress_msg "(not running)"
 			log_end_msg 0
@@ -57,7 +57,7 @@ case "$1" in
 		$0 start
 	;;
     status)
-    	/usr/games/cycmd localhost stat
+    	/usr/bin/cycmd localhost stat
 	;;
 	    *)
 		echo "Usage: /etc/init.d/cyphesis-cpp {start|stop|reload|force-reload|restart|status}"
diff --git a/debian/cyphesis-cpp.install b/debian/cyphesis-cpp.install
index e12944b..95ad8bf 100644
--- a/debian/cyphesis-cpp.install
+++ b/debian/cyphesis-cpp.install
@@ -1,9 +1,9 @@
 etc/cyphesis/cyphesis.vconf
 etc/cyphesis/mars.d/*
 etc/cyphesis/minimal.d/*
-usr/games/cyphesis
-usr/share/games/cyphesis/rulesets/basic/*
-usr/share/games/cyphesis/rulesets/mars/*
-usr/share/games/cyphesis/rulesets/minimal/*
-usr/share/games/cyphesis/scripts/*
-usr/share/games/doc/cyphesis-*/conf/* usr/share/games/doc/cyphesis-cpp/examples
+usr/bin/cyphesis
+usr/share/cyphesis/rulesets/basic/*
+usr/share/cyphesis/rulesets/mars/*
+usr/share/cyphesis/rulesets/minimal/*
+usr/share/cyphesis/scripts/*
+usr/share/doc/cyphesis-*/conf/* usr/share/doc/cyphesis-cpp/examples
diff --git a/debian/cyphesis-cpp.lintian-overrides b/debian/cyphesis-cpp.lintian-overrides
new file mode 100644
index 0000000..63fccf8
--- /dev/null
+++ b/debian/cyphesis-cpp.lintian-overrides
@@ -0,0 +1,4 @@
+# The Debian Games team is split about whether or not to implement packages
+# in this way. Fedora and most upstreams do not install into /usr/games. 
+# Not using /usr/games seems to be the direction for distro standardization.
+cyphesis-cpp: package-section-games-but-contains-no-game
diff --git a/debian/cyphesis-cpp.manpages b/debian/cyphesis-cpp.manpages
index 047bbb3..fbd2993 100644
--- a/debian/cyphesis-cpp.manpages
+++ b/debian/cyphesis-cpp.manpages
@@ -1 +1 @@
-man/cyphesis.6
+man/cyphesis.1
diff --git a/debian/cyphesis-cpp.postinst b/debian/cyphesis-cpp.postinst
index bc20d6e..9c8eca7 100644
--- a/debian/cyphesis-cpp.postinst
+++ b/debian/cyphesis-cpp.postinst
@@ -6,7 +6,7 @@ if [ "$1" = configure ] ;
 then
 
     # Add user cyphesis as system user
-            adduser --system --quiet --no-create-home --home /usr/share/games/cyphesis --gecos "Cyphesis C++ Administrator" --force-badname Cyphesis
+            adduser --system --quiet --no-create-home --home /usr/share/cyphesis --gecos "Cyphesis C++ Administrator" --force-badname Cyphesis
 
     update-rc.d cyphesis-cpp defaults >/dev/null
     invoke-rc.d cyphesis-cpp start || exit $?
diff --git a/debian/rules b/debian/rules
index 3a08d9d..c365f9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh $@ --parallel --with autoreconf,python2
 
 override_dh_install:
-	( find $(CURDIR)/debian/tmp/usr/share/games/cyphesis/rulesets/ -name *.py -print | xargs chmod a-x )
+	( find $(CURDIR)/debian/tmp/usr/share/cyphesis/rulesets/ -name *.py -print | xargs chmod a-x )
 	dh_install --list-missing -X.la -X.a
 
 override_dh_installinit:
 	dh_installinit --noscripts
-
-override_dh_auto_configure:
-	dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/cyphesis-cpp.git

