[redeclipse] 281/494: Install binaries as full names

[Martin Werner]

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

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit 41ee692d27640890bffacac5101de6fb09103670
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sun Dec 4 21:57:36 2011 +0100

    Install binaries as full names
    
    * Using the the corresponding names for binaries and icons allows
      the window manager to associate them in the panel and app switcher
---
 README.Debian             | 4 ++--
 clean                     | 2 ++
 redeclipse-server.6       | 6 +++---
 redeclipse-server.install | 2 +-
 redeclipse.6              | 4 ++--
 redeclipse.install        | 2 +-
 rules                     | 4 ++++
 scripts/redeclipse        | 2 +-
 scripts/redeclipse-server | 4 ++--
 9 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/README.Debian b/README.Debian
index c946395..eda261e 100644
--- a/README.Debian
+++ b/README.Debian
@@ -9,7 +9,7 @@ Debugging:
  redeclipse-dbg package to generate a backtrace of the crash.
  To generate a backtrace open a terminal and change to the directory
  /usr/lib/games/redeclipse using the command "cd /usr/lib/games/redeclipse".
- Then run "gdb ./reclient" and type "run -r -df0" at the gdb prompt.
+ Then run "gdb ./redeclipse" and type "run -r -df0" at the gdb prompt.
  Once redeclipse has crashed, type "bt" to obtain the backtrace. Please attach
  the output when you are reporting a bug about crashes.
 
@@ -18,6 +18,6 @@ Debugging:
  redeclipse-server-dbg package to generate a backtrace of the crash.
  To generate a backtrace open a terminal and change to the directory
  /usr/lib/games/redeclipse using the command "cd /usr/lib/games/redeclipse".
- Then run "gdb ./reserver" and type "run" at the gdb prompt.
+ Then run "gdb ./redeclipse-server" and type "run" at the gdb prompt.
  Once the redeclipse server has crashed, type "bt" to obtain the backtrace.
  Please attach the output when you are reporting a bug about crashes.
diff --git a/clean b/clean
index 4b46683..8eabfa9 100644
--- a/clean
+++ b/clean
@@ -1,4 +1,6 @@
 bin/reclient_native
 bin/reserver_native
+bin/redeclipse
+bin/redeclipse-server
 src/cube2font
 src/shared/cube2font.o
diff --git a/redeclipse-server.6 b/redeclipse-server.6
index 3ae2ef7..ea82657 100644
--- a/redeclipse-server.6
+++ b/redeclipse-server.6
@@ -80,7 +80,7 @@ Red Eclipse is a single-player and multi-player first-person ego-shooter, built
 .PP
 .B redeclipse-server
 is a script which executes
-.BR reserver
+.BR redeclipse-server
 from the
 .I /usr/lib/games/redeclipse
 directory, it will accept any additional options.
@@ -163,11 +163,11 @@ Users must know the password before they can connect.
 .B \-\-help
 Display this manpage
 .SH EXAMPLES
-.B reserver -p$HOME/mod/data -ss0 -slbath
+.B redeclipse-server -p$HOME/mod/data -ss0 -slbath
 .RS 4
 Loads data from an additional directory, sets the server type to local (LAN) and sets the default map to "bath"
 .RE
-.B redeclipse-server -h$HOME/reserver_configs/
+.B redeclipse-server -h$HOME/redeclipse-server_configs/
 .RS 4
 Reads and writes the configuration files to the specified directory instead of $HOME/.redeclipse/
 .RE
diff --git a/redeclipse-server.install b/redeclipse-server.install
index 2723178..886db61 100644
--- a/redeclipse-server.install
+++ b/redeclipse-server.install
@@ -1,2 +1,2 @@
-src/reserver usr/lib/games/redeclipse
+usr/lib/games/redeclipse/redeclipse-server
 debian/scripts/redeclipse-server /usr/games
diff --git a/redeclipse.6 b/redeclipse.6
index fb55b92..d501d1a 100644
--- a/redeclipse.6
+++ b/redeclipse.6
@@ -92,7 +92,7 @@ Red Eclipse is a single-player and multi-player first-person ego-shooter, built
 .PP
 .B redeclipse
 is a script which executes
-.BR reclient
+.BR redeclipse
 from the
 .I /usr/lib/games/redeclipse
 directory using the "\-r" option, it will accept any additional options.
@@ -217,7 +217,7 @@ Display this manpage
 .RS 4
 Load data from an additional directory.
 .RE
-.B redeclipse -h$HOME/reclient_configs/
+.B redeclipse -h$HOME/redeclipse_configs/
 .RS 4
 Reads and writes the configuration files to the specified directory instead of $HOME/.redeclipse/
 .RE
diff --git a/redeclipse.install b/redeclipse.install
index d6ebe62..9b5c534 100644
--- a/redeclipse.install
+++ b/redeclipse.install
@@ -1,4 +1,4 @@
-src/reclient usr/lib/games/redeclipse
+usr/lib/games/redeclipse/redeclipse
 debian/scripts/redeclipse usr/games
 debian/redeclipse.desktop usr/share/applications
 usr/share/icons/hicolor/16x16/apps/redeclipse.png
diff --git a/rules b/rules
index 1a15e99..2096048 100755
--- a/rules
+++ b/rules
@@ -38,6 +38,10 @@ override_dh_prep:
 	dh_prep --exclude=debian/tmp
 
 override_dh_install:
+	install -D bin/reclient_native \
+			debian/tmp/usr/lib/games/redeclipse/redeclipse
+	install -D bin/reserver_native \
+			debian/tmp/usr/lib/games/redeclipse/redeclipse-server
 	dh_install --exclude="license.txt"
 
 URL=https://redeclipse.svn.sourceforge.net/svnroot/redeclipse
diff --git a/scripts/redeclipse b/scripts/redeclipse
index ba14743..49dc459 100644
--- a/scripts/redeclipse
+++ b/scripts/redeclipse
@@ -9,4 +9,4 @@ done
 
 RE_OPTIONS="-r"
 cd /usr/lib/games/redeclipse || exit 1
-exec ./reclient ${RE_OPTIONS} ${1+"$@"}
+exec ./redeclipse ${RE_OPTIONS} ${1+"$@"}
diff --git a/scripts/redeclipse-server b/scripts/redeclipse-server
index db59152..bfb4098 100644
--- a/scripts/redeclipse-server
+++ b/scripts/redeclipse-server
@@ -3,10 +3,10 @@ for arg
 do
     if [ "$arg" = --help ]
     then
-       exec man redeclipse
+       exec man redeclipse-server
     fi
 done
 
 RE_OPTIONS=""
 cd /usr/lib/games/redeclipse || exit 1
-exec ./reserver ${RE_OPTIONS} ${1+"$@"}
+exec ./redeclipse-server ${RE_OPTIONS} ${1+"$@"}

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