Cyrus 2.1 and 2.2 init scripts

[Henrique de Moraes Holschuh]

I just commited the attached diff to cyrus21-imapd and uploaded with urgency
high.

Maybe the equivalent change should also be applied to 2.2?

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh
-------------- next part --------------
---------------------
PatchSet 1954 
Date: 2006/10/24 17:49:08
Author: hmh
Branch: HEAD
Tag: (none) 
Log:
Test for cyrus *2.1*, not just any cyrus

Members: 
	debian/changelog:1.329->1.330 
	debian/cyrus21-common.cron.daily:1.4->1.5 
	debian/cyrus21-common.cyrus21.init:1.2->1.3 

Index: debian/cyrus21-imapd/debian/changelog
diff -u debian/cyrus21-imapd/debian/changelog:1.329 debian/cyrus21-imapd/debian/changelog:1.330
--- debian/cyrus21-imapd/debian/changelog:1.329	Mon Sep 18 21:56:01 2006
+++ debian/cyrus21-imapd/debian/changelog	Tue Oct 24 20:49:08 2006
@@ -1,3 +1,12 @@
+cyrus21-imapd (2.1.18-5) unstable; urgency=high
+
+  * High urgency upload with simple fixes for Etch
+  * Prevent cronjobs and initscript from working when another version
+    of Cyrus IMAPD is installed and 2.1 is in removed but not purged
+    state
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>  Tue, 24 Oct 2006 20:48:48 -0300
+
 cyrus21-imapd (2.1.18-4) unstable; urgency=low
 
   * Test for debconf availability in postrm, and don't use it (and don't
Index: debian/cyrus21-imapd/debian/cyrus21-common.cron.daily
diff -u debian/cyrus21-imapd/debian/cyrus21-common.cron.daily:1.4 debian/cyrus21-imapd/debian/cyrus21-common.cron.daily:1.5
--- debian/cyrus21-imapd/debian/cyrus21-common.cron.daily:1.4	Tue Aug 10 12:09:38 2004
+++ debian/cyrus21-imapd/debian/cyrus21-common.cron.daily	Tue Oct 24 20:49:08 2006
@@ -2,7 +2,7 @@
 # Cyrus IMAPd daily maintenance script
 # Copyright (c) 2002,2003 by Henrique M. Holschuh
 # Distributed under the terms of the GNU General Public License version 2
-# $Id: cyrus21-common.cron.daily,v 1.4 2004-08-10 15:09:38 hmh Exp $
+# $Id: cyrus21-common.cron.daily,v 1.5 2006-10-24 23:49:08 hmh Exp $
 #
 # This script:
 #   1. Backups the mailbox database to the portable text format,
@@ -21,6 +21,11 @@
 LC_ALL=C
 export LC_ALL
 
+# Check if Cyrus 2.1 is installed
+test -x /usr/sbin/ctl_mboxlist || exit 0
+grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]1' \
+	/usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
+
 bak=/var/backups
 bakfile=${bak}/cyrus-mboxlist.txt.gz
 CONF=/etc/imapd.conf
Index: debian/cyrus21-imapd/debian/cyrus21-common.cyrus21.init
diff -u debian/cyrus21-imapd/debian/cyrus21-common.cyrus21.init:1.2 debian/cyrus21-imapd/debian/cyrus21-common.cyrus21.init:1.3
--- debian/cyrus21-imapd/debian/cyrus21-common.cyrus21.init:1.2	Tue Aug 10 12:09:38 2004
+++ debian/cyrus21-imapd/debian/cyrus21-common.cyrus21.init	Tue Oct 24 20:49:08 2006
@@ -6,7 +6,7 @@
 #		Copr. 2001 by Henrique de Moraes Holschuh <hmh at debian.org>
 #		Distributed under the GPL version 2
 #
-# Version:	$Id: cyrus21-common.cyrus21.init,v 1.2 2004-08-10 15:09:38 hmh Exp $
+# Version:	$Id: cyrus21-common.cyrus21.init,v 1.3 2006-10-24 23:49:08 hmh Exp $
 #
 
 # Make sure we get sane results on borked locales
@@ -27,7 +27,10 @@
 NAME=cyrmaster
 DESC="Cyrus IMAPd"
 
+# Check if Cyrus 2.1 is installed
 test -x ${DAEMON} || exit 0
+grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]1' \
+	/usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
 
 set -e