From 3aa6b46bb05cab5656d624ac37806797d548298f Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Tue, 28 Jul 2009 19:43:54 +0000
Subject: [PATCH 1/2] Monotone-Parent: 7d3304b769784beb1122a7a8507098f0d966fc4d
 Monotone-Revision: 4d3de62dbabf59955a6167e8ddf38e5dbfb00656

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-28T19:43:54
Monotone-Branch: ca.inverse.sogo
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index facde4ce1..14fa1a7eb 100644
--- a/debian/control
+++ b/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-core, libsope-appserver, libsope-ldap, libsope-cards
+Depends: gnustep-base-common, gnustep-base-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.

From ced2268aa511e4127f5b8761fd1949fe4b0677a4 Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Wed, 29 Jul 2009 13:11:46 +0000
Subject: [PATCH 2/2] Fixed deb issues

Monotone-Parent: 4d3de62dbabf59955a6167e8ddf38e5dbfb00656
Monotone-Revision: dea46a9c0a007139fa87fd98c606f1185523a535

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-29T13:11:46
Monotone-Branch: ca.inverse.sogo
---
 debian/rules         |  2 +-
 debian/sogo.postinst | 15 +++++++--------
 debian/sogo.postrm   |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index f072fa78a..8e2c65928 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ install-arch:
 	dh_installdirs -s
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp GNUSTEP_INSTALLATION_DOMAIN=SYSTEM  install
-	mkdir -p debian/tmp/etc/init.d/sogod
+	mkdir -p debian/tmp/etc/init.d
 	mkdir -p debian/tmp/etc/cron.daily
 	mkdir -p debian/tmp/var/run/sogo
 	mkdir -p debian/tmp/var/log/sogo
diff --git a/debian/sogo.postinst b/debian/sogo.postinst
index eac9b086d..35cac7bd0 100755
--- a/debian/sogo.postinst
+++ b/debian/sogo.postinst
@@ -2,17 +2,16 @@
 set -e
 
 /usr/sbin/groupadd -f -K GID_MIN=100 -K GID_MAX=500 sogo
-USERS=\`getent passwd|grep sogo|sed -e 's/\([a-zA-Z]*:\)\(.*\)/\1/g'\`
+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
+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
 fi
 
-chown sogo /var/run/sogo
-chown sogo /var/spool/sogo
-chown sogo /var/log/sogo
+chown -R sogo /var/run/sogo
+chown -R sogo /var/spool/sogo
+chown -R sogo /var/log/sogo
 update-rc.d sogod defaults
 /sbin/ldconfig
diff --git a/debian/sogo.postrm b/debian/sogo.postrm
index c0074bd72..28f349900 100755
--- a/debian/sogo.postrm
+++ b/debian/sogo.postrm
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
-userdel sogo||true
-update-rc.d SOGo remove ||true
+userdel sogo || true
+update-rc.d SOGo remove || true