[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. debian/0.44-2-6-g59c6db9

[Marco Amadori]

The following commit has been merged in the master branch:
commit 59c6db91e8b3c14353f3c6133d144a37dd264d21
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Thu Feb 18 00:13:19 2010 +0100

    Removed the springlobby.launcher wrapper.
    
    * spring now (>= 0.81.1.3) writes logs to a sane place.

diff --git a/debian/control b/debian/control
index 627eafb..8fbfa2d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Git: git://git.debian.org/pkg-games/springlobby.git
 Package: springlobby
 Provides: spring-lobby
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, spring
+Depends: ${shlibs:Depends}, ${misc:Depends}, spring (>= 0.81.1.3-1)
 Description: single/multiplayer lobby for the Spring RTS engine
  This package provides a single-player and multiplayer lobby for Spring.
  Other features include a P2P system for downloading maps and mods and
diff --git a/debian/rules b/debian/rules
index 28374e1..df9a290 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,6 @@ override_dh_auto_install:
 	# install launcher
 	mkdir -p $(PROGDIR)/usr/games
 	mv $(PROGDIR)/usr/bin/springsettings $(PROGDIR)/usr/games/
-	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
deleted file mode 100644
index 8f9b986..0000000
--- a/debian/springlobby.launcher
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Simple springlobby launcher
-# since springlobby is using libunitsync.so which opens a log file in the CWD
-# this program will just CD to a sane default before launching springlobby
-# this launcher will be removed as soon as libunitsync.so will be fixed
-
-if [ -s "/etc/spring/datadir" ]; then
-	DATADIR="`cat /etc/spring/datadir`"
-else
-	DATADIR="$HOME/.spring"
-fi
-
-DATADIR="`eval readlink -f ${DATADIR}`"
-
-if [ ! -d "${DATADIR}" ]; then
-	mkdir "${DATADIR}"
-fi
-
-cd "${DATADIR}"
-exec /usr/lib/springlobby/bin/springlobby
-

-- 
single/multiplayer lobby for the Spring RTS engine