[Pkg-citadel-commit] r180 - in citadel: tags tags/7.37-7/debian trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-14 16:45:32 +0000 (Fri, 14 Nov 2008)
New Revision: 180

Added:
   citadel/tags/7.37-7/
Modified:
   citadel/tags/7.37-7/debian/changelog
   citadel/tags/7.37-7/debian/citadel-server.postinst
   citadel/trunk/debian/changelog
   citadel/trunk/debian/citadel-server.postinst
Log:
Do not call citmail in postinst if it is not available.



Copied: citadel/tags/7.37-7 (from rev 179, citadel/tags/7.37-6)

Modified: citadel/tags/7.37-7/debian/changelog
===================================================================
--- citadel/tags/7.37-6/debian/changelog	2008-11-12 13:46:38 UTC (rev 179)
+++ citadel/tags/7.37-7/debian/changelog	2008-11-14 16:45:32 UTC (rev 180)
@@ -1,3 +1,9 @@
+citadel (7.37-7) unstable; urgency=medium
+
+  * Do not call citmail if it does not exists, closes: #505715
+
+ -- Michael Meskes <meskes at debian.org>  Fri, 14 Nov 2008 17:41:29 +0100
+
 citadel (7.37-6) unstable; urgency=low
 
     [ Wilfried Goesgens ]

Modified: citadel/tags/7.37-7/debian/citadel-server.postinst
===================================================================
--- citadel/tags/7.37-6/debian/citadel-server.postinst	2008-11-12 13:46:38 UTC (rev 179)
+++ citadel/tags/7.37-7/debian/citadel-server.postinst	2008-11-14 16:45:32 UTC (rev 180)
@@ -48,7 +48,7 @@
 		sleep 1
 		i=$(($i + 1))
 	    done
-	    if test -S /var/run/citadel/lmtp.socket ; then
+	    if test -S /var/run/citadel/lmtp.socket -a -x /usr/sbin/citmail ; then
 		export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
 		export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
 		export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt

Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2008-11-12 13:46:38 UTC (rev 179)
+++ citadel/trunk/debian/changelog	2008-11-14 16:45:32 UTC (rev 180)
@@ -13,6 +13,12 @@
 
  -- Michael Meskes <meskes at debian.org>  Mon, 06 Oct 2008 14:21:00 +0200
 
+citadel (7.37-7) unstable; urgency=medium
+
+  * Do not call citmail if it does not exists, closes: #505715
+
+ -- Michael Meskes <meskes at debian.org>  Fri, 14 Nov 2008 17:41:29 +0100
+
 citadel (7.37-6) unstable; urgency=low
 
     [ Wilfried Goesgens ]

Modified: citadel/trunk/debian/citadel-server.postinst
===================================================================
--- citadel/trunk/debian/citadel-server.postinst	2008-11-12 13:46:38 UTC (rev 179)
+++ citadel/trunk/debian/citadel-server.postinst	2008-11-14 16:45:32 UTC (rev 180)
@@ -48,7 +48,7 @@
 		sleep 1
 		i=$(($i + 1))
 	    done
-	    if test -S /var/run/citadel/lmtp.socket ; then
+	    if test -S /var/run/citadel/lmtp.socket -a -x /usr/sbin/citmail ; then
 		export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
 		export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
 		export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt