[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. debian/0.40-1-7-g7c33c69

[Marco Amadori]

The following commit has been merged in the master branch:
commit 2ea12af46f73a259b07c1894d0378eef1241561c
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Tue Dec 15 10:40:26 2009 +0100

    Launcher will pollute less /usr/games.

diff --git a/debian/links b/debian/links
deleted file mode 100644
index b4fc787..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man6/springlobby.6.gz /usr/share/man/man6/springlobby.real.6.gz
diff --git a/debian/rules b/debian/rules
index 66bfd12..b825195 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,8 @@ override_dh_auto_install:
 	# install launcher
 	mkdir -p $(PROGDIR)/usr/games
 	mv $(PROGDIR)/usr/bin/springsettings $(PROGDIR)/usr/games/
-	mv $(PROGDIR)/usr/bin/springlobby $(PROGDIR)/usr/games/springlobby.real
+	mkdir -p $(PROGDIR)/usr/lib/springlobby/bin/
+	mv $(PROGDIR)/usr/bin/springlobby $(PROGDIR)/usr/lib/springlobby/bin/
 	install debian/springlobby.launcher $(PROGDIR)/usr/games/springlobby
 	# remove empty dirs (/usr/bin expected until an CMake bindir is provided)
 	find $(PROGDIR) -type d -empty -delete
diff --git a/debian/springlobby.launcher b/debian/springlobby.launcher
index 60e783c..8f9b986 100644
--- a/debian/springlobby.launcher
+++ b/debian/springlobby.launcher
@@ -18,5 +18,5 @@ if [ ! -d "${DATADIR}" ]; then
 fi
 
 cd "${DATADIR}"
-springlobby.real
+exec /usr/lib/springlobby/bin/springlobby
 

-- 
single/multiplayer lobby for the Spring RTS engine