.deb fixes again

Monotone-Parent: fab08bf8720de962c3bb022e001f14074f1e3e05
Monotone-Revision: 0801b840389e27365ffcfe12265d379abb2dc676

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-30T20:44:04
Monotone-Branch: ca.inverse.sogo

debian/control

@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sogo
 Section: web
 Architecture: i386
-Depends: gnustep-base-common, gnustep-base-runtime, libsope-core4.9, libsope-appserver4.9, libsope-ldap4.9
+Depends: gnustep-base-common, gnustep-base-runtime, gnustep-gui-common, gnustep-gui-runtime, libsope-core4.9, libsope-appserver4.9, libsope-ldap4.9
 Description: SOGo
  SOGo is a groupware server built around OpenGroupware.org (OGo) and
  the SOPE application server.  It focuses on scalability.

debian/rules

@@ -54,13 +54,11 @@ install-arch:
 	mkdir -p debian/tmp/etc/default
 	mkdir -p debian/tmp/etc/apache2/conf.d
 	mkdir -p debian/tmp/usr/sbin
-	mkdir -p debian/tmp/usr/share/GNUstep/Tools
-	echo "DAEMON=/usr/sbin/sogod" >> debian/tmp/etc/default/sogo
+	echo "DAEMON=/usr/sbin/sogod-launcher" >> debian/tmp/etc/default/sogo
 	cp Scripts/sogo-init.d-debian debian/tmp/etc/init.d/sogod
 	cp Scripts/tmpwatch debian/tmp/etc/cron.daily/sogo-tmpwatch
-	cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/
-	mv debian/tmp/usr/sbin/sogod debian/tmp/usr/share/GNUstep/Tools
-	cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod
+	cp Apache/SOGo-debian.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
+	cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-launcher
 
 	dh_install -s
 

debian/sogo.postinst

@@ -7,7 +7,7 @@ USERS=`getent passwd | grep sogo | sed -e 's/\([a-zA-Z]*\):.*/\1/g'`
 
 if [ "$USERS" != "sogo" ] ; then
   echo "Adding user sogo"
-  useradd -d /tmp -g sogo -K UID_MIN=100 -K UID_MAX=500 -K PASS_MAX_DAYS=-1 -s /bin/false sogo
+  useradd -d /home/sogo -g sogo -m -K UID_MIN=100 -K UID_MAX=500 -K PASS_MAX_DAYS=-1 -s /bin/bash sogo
 fi
 
 chown -R sogo /var/run/sogo