diff -u cyrus21-imapd-2.1.18/autogen.sh cyrus21-imapd-2.1.18/autogen.sh
--- cyrus21-imapd-2.1.18/autogen.sh
+++ cyrus21-imapd-2.1.18/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # autogen.sh glue for CMU Cyrus IMAP
-# $Id: autogen.sh,v 1.16 2004/09/12 15:30:23 hmh Exp $
+# $Id: autogen.sh,v 1.16 2004-09-12 15:30:23 hmh Exp $
 #
 # Requires: automake 1.9, autoconf 2.57, dpkg-dev
 set -e
diff -u cyrus21-imapd-2.1.18/debian/README.Debian cyrus21-imapd-2.1.18/debian/README.Debian
--- cyrus21-imapd-2.1.18/debian/README.Debian
+++ cyrus21-imapd-2.1.18/debian/README.Debian
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian
-$Id: README.Debian,v 1.53 2004/08/06 20:57:11 hmh Exp $
+$Id: README.Debian,v 1.53 2004-08-06 20:57:11 hmh Exp $
 ---------------------
 
    "All systems administrators have their horror stories. For me, it was
diff -u cyrus21-imapd-2.1.18/debian/README.Debian.database cyrus21-imapd-2.1.18/debian/README.Debian.database
--- cyrus21-imapd-2.1.18/debian/README.Debian.database
+++ cyrus21-imapd-2.1.18/debian/README.Debian.database
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian: Database backend conversion
-$Id: README.Debian.database,v 1.3 2003/10/20 15:14:46 hmh Exp $
+$Id: README.Debian.database,v 1.3 2003-10-20 15:14:46 hmh Exp $
 --------------------------------------------------
 
    "All systems administrators have their horror stories. For me, it was
diff -u cyrus21-imapd-2.1.18/debian/README.Debian.debug cyrus21-imapd-2.1.18/debian/README.Debian.debug
--- cyrus21-imapd-2.1.18/debian/README.Debian.debug
+++ cyrus21-imapd-2.1.18/debian/README.Debian.debug
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian, debugging procedures
-$Id: README.Debian.debug,v 1.9 2004/10/17 20:24:41 hmh Exp $
+$Id: README.Debian.debug,v 1.9 2004-10-17 20:24:41 hmh Exp $
 -------------------------------------------
 
 For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
diff -u cyrus21-imapd-2.1.18/debian/README.Debian.simpleinstall cyrus21-imapd-2.1.18/debian/README.Debian.simpleinstall
--- cyrus21-imapd-2.1.18/debian/README.Debian.simpleinstall
+++ cyrus21-imapd-2.1.18/debian/README.Debian.simpleinstall
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian, Simple Install Guide
-$Id: README.Debian.simpleinstall,v 1.11 2003/12/19 09:29:32 hmh Exp $
+$Id: README.Debian.simpleinstall,v 1.11 2003-12-19 09:29:32 hmh Exp $
 -------------------------------------------
 
    "All systems administrators have their horror stories. For me, it was
diff -u cyrus21-imapd-2.1.18/debian/README.exim cyrus21-imapd-2.1.18/debian/README.exim
--- cyrus21-imapd-2.1.18/debian/README.exim
+++ cyrus21-imapd-2.1.18/debian/README.exim
@@ -1,5 +1,5 @@
 Setting up Cyrus IMAPd for Exim
-$Id: README.exim,v 1.5 2004/01/31 19:41:29 hmh Exp $
+$Id: README.exim,v 1.5 2004-01-31 19:41:29 hmh Exp $
 ===========================================================
 
 This is very incomplete information, if you are an exim user, please send
diff -u cyrus21-imapd-2.1.18/debian/README.postfix cyrus21-imapd-2.1.18/debian/README.postfix
--- cyrus21-imapd-2.1.18/debian/README.postfix
+++ cyrus21-imapd-2.1.18/debian/README.postfix
@@ -1,5 +1,5 @@
 Setting up Cyrus IMAPd for Postfix (Debian)
-$Id: README.postfix,v 1.9 2004/08/06 17:50:00 hmh Exp $
+$Id: README.postfix,v 1.9 2004-08-06 17:50:00 hmh Exp $
 ===========================================================
 
 Cyrus works wonderfully well with Postfix, both in single-system stores (where
diff -u cyrus21-imapd-2.1.18/debian/README.sendmail cyrus21-imapd-2.1.18/debian/README.sendmail
--- cyrus21-imapd-2.1.18/debian/README.sendmail
+++ cyrus21-imapd-2.1.18/debian/README.sendmail
@@ -1,5 +1,5 @@
 Setting up Cyrus IMAPd for Sendmail (Debian)
-$Id: README.sendmail,v 1.2 2004/03/01 09:38:46 hmh Exp $
+$Id: README.sendmail,v 1.2 2004-03-01 09:38:46 hmh Exp $
 ===========================================================
 
 [This is user-contributed, unverified information]
diff -u cyrus21-imapd-2.1.18/debian/TODO.Debian cyrus21-imapd-2.1.18/debian/TODO.Debian
--- cyrus21-imapd-2.1.18/debian/TODO.Debian
+++ cyrus21-imapd-2.1.18/debian/TODO.Debian
@@ -1,6 +1,6 @@
 Todo list
 ---------
-$Id: TODO.Debian,v 1.65 2004/11/23 19:26:26 hmh Exp $
+$Id: TODO.Debian,v 1.65 2004-11-23 19:26:26 hmh Exp $
 
 EXTRA HIGH
 o --name for start-stop-daemon
diff -u cyrus21-imapd-2.1.18/debian/UPGRADE.Debian cyrus21-imapd-2.1.18/debian/UPGRADE.Debian
--- cyrus21-imapd-2.1.18/debian/UPGRADE.Debian
+++ cyrus21-imapd-2.1.18/debian/UPGRADE.Debian
@@ -1,5 +1,5 @@
 Upgrading cyrus-imapd to cyrus2-imapd on Debian
-$Id: UPGRADE.Debian,v 1.15 2004/11/23 12:35:35 hmh Exp $
+$Id: UPGRADE.Debian,v 1.15.2.3 2006-02-21 00:24:17 hmh Exp $
 (thanks to David D. Kilzer <ddkilzer@theracingworld.com> for this document)
 -----------------------------------------------
 
@@ -39,8 +39,28 @@
 
  3. Remove the old cyrus packages.
 
+    ######################################################################
+    WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING
+    ######################################################################
+    
+    Some versions of the cyrus-imapd packages, with versions 1.5.19-9.10
+    up to 1.5.19-20 (shipped in Debian Sarge 3.1r1) will entirely erase
+    the mail spool when purged with no questions asked.
+    
+    You must NOT purge these packages before moving /var/lib/cyrus and
+    /var/spool/cyrus to somewhere safe.  Failure to do so will cause data
+    loss.
+    
+    # mv /var/lib/cyrus /var/lib/old-cyrus
+    # mv /var/spool/cyrus /var/spool/old-cyrus
+
+    The cyrus-imapd packages in Woody (1.5.19-9.2) are safe, as well as
+    the fixed cyrus-imapd packages 1.5.19-20+sarge1.
+
+    ######################################################################
+
     # apt-get --purge remove cyrus-common cyrus-admin cyrus-imapd cyrus-pop3d \
-      cyrus-nntpd
+      cyrus-nntpd   [BUT SEE THE ABOVE WARNING FIRST!!!]
 
     or use dselect/aptitude/synaptic/your favorite deb management tool.
 
diff -u cyrus21-imapd-2.1.18/debian/changelog cyrus21-imapd-2.1.18/debian/changelog
--- cyrus21-imapd-2.1.18/debian/changelog
+++ cyrus21-imapd-2.1.18/debian/changelog
@@ -1,3 +1,21 @@
+cyrus21-imapd (2.1.18-1+sarge1) stable; urgency=high
+
+  * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd 1.5.19-20,
+    shipped in Debian Sarge 3.1r1 and r0, which would cause data loss when
+    UPGRADE.Debian instructions were followed (closes: #348186)
+
+  * Release Manager: this upload closes a grave bug, dealing with severe
+    data loss.  The cyrus21-imapd packages in Sarge assumed the behaviour of
+    cyrus-imapd in Woody, and instruct the user to purge the cyrus-imapd
+    package on the upgrade documentation.  In order to fix this problem, the
+    upgrade documentation in all cyrus 2.1 and 2.2 packages has been fixed
+    with large warnings, and a two-pronged approach consisting of this
+    upload to stable of cyrus21-imapd with the documentation fixes plus an
+    upload to stable of cyrus-imapd with postrm fixes was deemed the safest
+    way by the Cyrus IMAPD packaging team.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Thu, 19 Jan 2006 11:12:13 -0200
+
 cyrus21-imapd (2.1.18-1) unstable; urgency=high
 
   * New upstream source:
diff -u cyrus21-imapd-2.1.18/debian/copyright cyrus21-imapd-2.1.18/debian/copyright
--- cyrus21-imapd-2.1.18/debian/copyright
+++ cyrus21-imapd-2.1.18/debian/copyright
@@ -1,4 +1,4 @@
-$Id: copyright,v 1.9 2004/08/07 00:04:06 hmh Exp $
+$Id: copyright,v 1.9 2004-08-07 00:04:06 hmh Exp $
 
 This package was debianized by Henrique de Moraes Holschuh <hmh@debian.org> on
 Wed Sep 12 09:35:30 BRT 2001, based on previous work by Michael-John Turner
diff -u cyrus21-imapd-2.1.18/debian/cyrus-makedirs cyrus21-imapd-2.1.18/debian/cyrus-makedirs
--- cyrus21-imapd-2.1.18/debian/cyrus-makedirs
+++ cyrus21-imapd-2.1.18/debian/cyrus-makedirs
@@ -6,7 +6,7 @@
 #  Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh@debian.org.
 #  Released under the terms of the GNU General Public License (GPL) version 2
 #
-# $Id: cyrus-makedirs,v 1.12 2004/08/10 15:09:38 hmh Exp $
+# $Id: cyrus-makedirs,v 1.12 2004-08-10 15:09:38 hmh Exp $
 
 # See lib/util.c, dir_hash_c for Cyrus' directory hashing
 # for the new hash style
diff -u cyrus21-imapd-2.1.18/debian/cyrus.conf cyrus21-imapd-2.1.18/debian/cyrus.conf
--- cyrus21-imapd-2.1.18/debian/cyrus.conf
+++ cyrus21-imapd-2.1.18/debian/cyrus.conf
@@ -2,7 +2,7 @@
 # see cyrus.conf(5) for more information
 #
 # All the tcp services are tcpd-wrapped. see hosts_access(5)
-# $Id: cyrus.conf,v 1.16 2003/11/05 01:04:22 hmh Exp $
+# $Id: cyrus.conf,v 1.16 2003-11-05 01:04:22 hmh Exp $
 
 START {
 	# do not delete this entry!
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-admin.README.Debian cyrus21-imapd-2.1.18/debian/cyrus21-admin.README.Debian
--- cyrus21-imapd-2.1.18/debian/cyrus21-admin.README.Debian
+++ cyrus21-imapd-2.1.18/debian/cyrus21-admin.README.Debian
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian, admin utilities
-$Id: cyrus21-admin.README.Debian,v 1.1 2003/03/04 13:13:29 hmh Exp $
+$Id: cyrus21-admin.README.Debian,v 1.1 2003-03-04 13:13:29 hmh Exp $
 ---------------------
 
 Refer to the cyrus21-doc package for more information.  There is a lot
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-clients.README.Debian cyrus21-imapd-2.1.18/debian/cyrus21-clients.README.Debian
--- cyrus21-imapd-2.1.18/debian/cyrus21-clients.README.Debian
+++ cyrus21-imapd-2.1.18/debian/cyrus21-clients.README.Debian
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian, generic SASL-enabled protocol clients
-$Id: cyrus21-clients.README.Debian,v 1.1 2003/03/04 13:13:29 hmh Exp $
+$Id: cyrus21-clients.README.Debian,v 1.1 2003-03-04 13:13:29 hmh Exp $
 ---------------------
 
 Refer to the cyrus21-doc package for more information.  There is a lot
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-common.cron.daily cyrus21-imapd-2.1.18/debian/cyrus21-common.cron.daily
--- cyrus21-imapd-2.1.18/debian/cyrus21-common.cron.daily
+++ cyrus21-imapd-2.1.18/debian/cyrus21-common.cron.daily
@@ -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.4 2004-08-10 15:09:38 hmh Exp $
 #
 # This script:
 #   1. Backups the mailbox database to the portable text format,
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.default cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.default
--- cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.default
+++ cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.default
@@ -1,7 +1,7 @@
 # Defaults for Cyrus IMAPd 2.1 scripts
 # sourced by /etc/init.d/cyrus21, /usr/sbin/cyrus-makedirs
 # installed at /etc/default/cyrus21 by the maintainer scripts
-# $Id: cyrus21-common.cyrus21.default,v 1.2 2003/10/08 11:43:52 hmh Exp $
+# $Id: cyrus21-common.cyrus21.default,v 1.2 2003-10-08 11:43:52 hmh Exp $
 
 #
 # This is a POSIX shell fragment
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.init cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.init
--- cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.init
+++ cyrus21-imapd-2.1.18/debian/cyrus21-common.cyrus21.init
@@ -6,7 +6,7 @@
 #		Copr. 2001 by Henrique de Moraes Holschuh <hmh@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.2 2004-08-10 15:09:38 hmh Exp $
 #
 
 # Make sure we get sane results on borked locales
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-common.postinst cyrus21-imapd-2.1.18/debian/cyrus21-common.postinst
--- cyrus21-imapd-2.1.18/debian/cyrus21-common.postinst
+++ cyrus21-imapd-2.1.18/debian/cyrus21-common.postinst
@@ -2,7 +2,7 @@
 # postinst script for cyrus21-common
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: cyrus21-common.postinst,v 1.18 2004/08/10 15:20:08 hmh Exp $
+# $Id: cyrus21-common.postinst,v 1.18 2004-08-10 15:20:08 hmh Exp $
 #
 # see: dh_installdeb(1)
 
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-common.postrm cyrus21-imapd-2.1.18/debian/cyrus21-common.postrm
--- cyrus21-imapd-2.1.18/debian/cyrus21-common.postrm
+++ cyrus21-imapd-2.1.18/debian/cyrus21-common.postrm
@@ -2,7 +2,7 @@
 # postrm script for cyrus21-common
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: cyrus21-common.postrm,v 1.12 2004/11/23 12:41:47 hmh Exp $
+# $Id: cyrus21-common.postrm,v 1.12 2004-11-23 12:41:47 hmh Exp $
 #
 # see: dh_installdeb(1)
 
diff -u cyrus21-imapd-2.1.18/debian/cyrus21-common.prerm cyrus21-imapd-2.1.18/debian/cyrus21-common.prerm
--- cyrus21-imapd-2.1.18/debian/cyrus21-common.prerm
+++ cyrus21-imapd-2.1.18/debian/cyrus21-common.prerm
@@ -2,7 +2,7 @@
 # prerm script for cyrus21-common
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: cyrus21-common.prerm,v 1.3 2002/05/26 20:55:50 hmh Exp $
+# $Id: cyrus21-common.prerm,v 1.3 2002-05-26 20:55:50 hmh Exp $
 #
 # see: dh_installdeb(1)
 
diff -u cyrus21-imapd-2.1.18/debian/imap.pam cyrus21-imapd-2.1.18/debian/imap.pam
--- cyrus21-imapd-2.1.18/debian/imap.pam
+++ cyrus21-imapd-2.1.18/debian/imap.pam
@@ -1,5 +1,5 @@
 # PAM configuration file for Cyrus IMAP service
-# $Id: imap.pam,v 1.3 2003/10/02 04:58:38 hmh Exp $
+# $Id: imap.pam,v 1.3 2003-10-02 04:58:38 hmh Exp $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure
diff -u cyrus21-imapd-2.1.18/debian/lmtp.pam cyrus21-imapd-2.1.18/debian/lmtp.pam
--- cyrus21-imapd-2.1.18/debian/lmtp.pam
+++ cyrus21-imapd-2.1.18/debian/lmtp.pam
@@ -1,5 +1,5 @@
 # PAM configuration file for Cyrus LMTP service
-# $Id: lmtp.pam,v 1.3 2003/10/02 04:58:38 hmh Exp $
+# $Id: lmtp.pam,v 1.3 2003-10-02 04:58:38 hmh Exp $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure
diff -u cyrus21-imapd-2.1.18/debian/mupdate.pam cyrus21-imapd-2.1.18/debian/mupdate.pam
--- cyrus21-imapd-2.1.18/debian/mupdate.pam
+++ cyrus21-imapd-2.1.18/debian/mupdate.pam
@@ -1,5 +1,5 @@
 # PAM configuration file for Cyrus Murder mupdate service
-# $Id: mupdate.pam,v 1.3 2003/10/02 04:58:38 hmh Exp $
+# $Id: mupdate.pam,v 1.3 2003-10-02 04:58:38 hmh Exp $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure
diff -u cyrus21-imapd-2.1.18/debian/pop.pam cyrus21-imapd-2.1.18/debian/pop.pam
--- cyrus21-imapd-2.1.18/debian/pop.pam
+++ cyrus21-imapd-2.1.18/debian/pop.pam
@@ -1,5 +1,5 @@
 # PAM configuration file for Cyrus POP3 service
-# $Id: pop.pam,v 1.3 2003/10/02 04:58:38 hmh Exp $
+# $Id: pop.pam,v 1.3 2003-10-02 04:58:38 hmh Exp $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure
diff -u cyrus21-imapd-2.1.18/debian/rules cyrus21-imapd-2.1.18/debian/rules
--- cyrus21-imapd-2.1.18/debian/rules
+++ cyrus21-imapd-2.1.18/debian/rules
@@ -6,7 +6,7 @@
 # Based on previous work by Michael-John Turner <mj@debian.org>,
 #			    David Parker <david@neongoat.com>
 #
-# $Id: rules,v 1.85 2005/03/03 13:42:48 hmh Exp $
+# $Id: rules,v 1.85 2005-03-03 13:42:48 hmh Exp $
 
 # DebHelper control
 export DH_ALWAYS_EXCLUDE=CVS
diff -u cyrus21-imapd-2.1.18/debian/sieve.pam cyrus21-imapd-2.1.18/debian/sieve.pam
--- cyrus21-imapd-2.1.18/debian/sieve.pam
+++ cyrus21-imapd-2.1.18/debian/sieve.pam
@@ -1,5 +1,5 @@
 # PAM configuration file for Cyrus SIEVE timsieved service
-# $Id: sieve.pam,v 1.3 2003/10/02 04:58:38 hmh Exp $
+# $Id: sieve.pam,v 1.3 2003-10-02 04:58:38 hmh Exp $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure
diff -u cyrus21-imapd-2.1.18/debian/po/fr.po cyrus21-imapd-2.1.18/debian/po/fr.po
--- cyrus21-imapd-2.1.18/debian/po/fr.po
+++ cyrus21-imapd-2.1.18/debian/po/fr.po
@@ -1,7 +1,7 @@
 # PO-DEBCONF TEMPLATE FOR cyrus21-imapd.
 # Copyright (C) 2002 Henrique de Moraes Holschuh <hmh@debian.org>
 # This file is distributed under the same license as the cyrus21-imapd package.
-# $Id: fr.po,v 1.3 2003/04/23 13:49:03 hmh Exp $
+# $Id: fr.po,v 1.3 2003-04-23 13:49:03 hmh Exp $
 #
 msgid ""
 msgstr ""
diff -u cyrus21-imapd-2.1.18/debian/po/pt_BR.po cyrus21-imapd-2.1.18/debian/po/pt_BR.po
--- cyrus21-imapd-2.1.18/debian/po/pt_BR.po
+++ cyrus21-imapd-2.1.18/debian/po/pt_BR.po
@@ -1,7 +1,7 @@
 # PO-DEBCONF TEMPLATE FOR cyrus21-imapd.
 # Copyright (C) 2002 Henrique de Moraes Holschuh <hmh@debian.org>
 # This file is distributed under the same license as the cyrus21-imapd package.
-# $Id: pt_BR.po,v 1.2 2003/03/03 13:48:27 hmh Exp $
+# $Id: pt_BR.po,v 1.2 2003-03-03 13:48:27 hmh Exp $
 #
 #, fuzzy
 msgid ""
diff -u cyrus21-imapd-2.1.18/debian/executable.files cyrus21-imapd-2.1.18/debian/executable.files
--- cyrus21-imapd-2.1.18/debian/executable.files
+++ cyrus21-imapd-2.1.18/debian/executable.files
@@ -1,36 +1,36 @@
-./autogen.sh
-./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
-./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
-./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
-./contrib/cyrus-graphtools.1.0/script/cyrus.pl
-./contrib/cyrus-graphtools.1.0/script/run
-./contrib/notify_unix/simple_notify.pl
-./contrib/notify_unix/sql_notify.pl
-./debian/cyrus-makedirs
+./perl/imap/examples/test-imsp.pl
+./lib/test/run
+./makedepend/install-sh
+./makedepend/configure
+./netnews/inn.diffs
+./install-sh
+./config.sub
 ./debian/cyrus21-common.cyrus21.init
 ./debian/cyrus21-common.postinst
+./debian/rules
 ./debian/cyrus21-common.postrm
 ./debian/cyrus21-common.prerm
-./debian/rules
+./debian/cyrus-makedirs
 ./debian/examples/mboxtocyrus
-./imap/xversion.sh
-./lib/test/run
-./makedepend/configure
-./makedepend/install-sh
-./netnews/inn.diffs
-./perl/imap/examples/test-imsp.pl
-./ptclient/doptclient
-./sieve/hmac-md5.h
+./autogen.sh
 ./snmp/snmpgen
+./imap/xversion.sh
+./config.guess
+./mkinstalldirs
 ./tools/dohash
-./tools/mkimap
-./tools/not-mkdep
-./tools/rehash
 ./tools/translatesieve
-./tools/undohash
 ./tools/upgradesieve
-./config.guess
-./config.sub
-./install-sh
-./mkinstalldirs
+./tools/not-mkdep
+./tools/undohash
+./tools/mkimap
+./tools/rehash
+./sieve/hmac-md5.h
 ./configure
+./ptclient/doptclient
+./contrib/notify_unix/sql_notify.pl
+./contrib/notify_unix/simple_notify.pl
+./contrib/cyrus-graphtools.1.0/script/run
+./contrib/cyrus-graphtools.1.0/script/cyrus.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
diff -u cyrus21-imapd-2.1.18/debian/deletable.files cyrus21-imapd-2.1.18/debian/deletable.files
--- cyrus21-imapd-2.1.18/debian/deletable.files
+++ cyrus21-imapd-2.1.18/debian/deletable.files
@@ -1,84 +1,84 @@
+man/sieveshell.1
+imap/lmtpstats.h
+imap/lmtpstats.c
+imap/pushstats.h
+imap/pushstats.c
+imap/imap_err.c
+imap/imap_err.h
+sieve/sieve.c
+sieve/sieve.h
+sieve/addr.c
+sieve/sieve-lex.c
+sieve/sieve_err.h
+sieve/sieve_err.c
+sieve/addr.h
+sieve/addr-lex.c
 acconfig.h
-doc/man/arbitron.8.html
-doc/man/chk_cyrus.8.html
-doc/man/collectnews.8.html
-doc/man/ctl_cyrusdb.8.html
-doc/man/ctl_deliver.8.html
-doc/man/ctl_mboxlist.8.html
-doc/man/cvt_cyrusdb.8.html
-doc/man/cyrus.conf.5.html
-doc/man/deliver.8.html
-doc/man/fud.8.html
-doc/man/idled.8.html
-doc/man/imapd.8.html
-doc/man/imapd.conf.5.html
-doc/man/imclient.3.html
-doc/man/imtest.1.html
-doc/man/installsieve.1.html
-doc/man/ipurge.8.html
-doc/man/krb.equiv.5.html
-doc/man/lmtpd.8.html
-doc/man/lmtptest.1.html
-doc/man/master.8.html
-doc/man/mbexamine.8.html
-doc/man/mbpath.8.html
-doc/man/mupdatetest.1.html
-doc/man/notifyd.8.html
-doc/man/pop3d.8.html
-doc/man/pop3test.1.html
-doc/man/quota.8.html
-doc/man/reconstruct.8.html
-doc/man/rmnews.8.html
-doc/man/sivtest.1.html
-doc/man/smtptest.1.html
-doc/man/squatter.8.html
-doc/man/syncnews.8.html
-doc/man/timsieved.8.html
-doc/man/tls_prune.8.html
-doc/man/cyradm.1.html
-doc/man/sieveshell.1.html
+doc/text/install-testing
+doc/text/install-prereq
+doc/text/readme
+doc/text/install
+doc/text/feedback
+doc/text/install-admin-mb
 doc/text/altnamespace
-doc/text/anoncvs
 doc/text/bugs
-doc/text/changes
-doc/text/faq
-doc/text/feedback
+doc/text/man
+doc/text/os
+doc/text/install-perf
+doc/text/specs
 doc/text/index
-doc/text/install-admin-mb
+doc/text/mailing-list
+doc/text/questions
+doc/text/sieve
 doc/text/install-auth
-doc/text/install-compile
 doc/text/install-configure
-doc/text/install-murder
-doc/text/install-perf
-doc/text/install-prereq
-doc/text/install-sieve
-doc/text/install-snmpmon
-doc/text/install-testing
+doc/text/anoncvs
 doc/text/install-upgrade
-doc/text/install
-doc/text/mailing-list
-doc/text/man
+doc/text/faq
 doc/text/notes
-doc/text/os
-doc/text/overview
-doc/text/questions
-doc/text/readme
 doc/text/sieve-protocol
-doc/text/sieve
-doc/text/specs
+doc/text/install-sieve
+doc/text/install-snmpmon
+doc/text/overview
+doc/text/install-murder
+doc/text/changes
+doc/text/install-compile
+doc/man/mbpath.8.html
+doc/man/installsieve.1.html
+doc/man/reconstruct.8.html
+doc/man/lmtpd.8.html
+doc/man/mbexamine.8.html
+doc/man/cvt_cyrusdb.8.html
+doc/man/ctl_mboxlist.8.html
+doc/man/rmnews.8.html
+doc/man/tls_prune.8.html
+doc/man/imclient.3.html
+doc/man/notifyd.8.html
+doc/man/deliver.8.html
+doc/man/sivtest.1.html
+doc/man/squatter.8.html
+doc/man/collectnews.8.html
+doc/man/arbitron.8.html
+doc/man/ipurge.8.html
+doc/man/timsieved.8.html
+doc/man/cyrus.conf.5.html
+doc/man/ctl_cyrusdb.8.html
+doc/man/mupdatetest.1.html
+doc/man/sieveshell.1.html
+doc/man/imapd.8.html
+doc/man/lmtptest.1.html
+doc/man/smtptest.1.html
+doc/man/krb.equiv.5.html
+doc/man/idled.8.html
+doc/man/fud.8.html
+doc/man/chk_cyrus.8.html
+doc/man/master.8.html
+doc/man/ctl_deliver.8.html
+doc/man/imtest.1.html
+doc/man/quota.8.html
+doc/man/syncnews.8.html
+doc/man/pop3d.8.html
+doc/man/pop3test.1.html
+doc/man/cyradm.1.html
+doc/man/imapd.conf.5.html
 doc/murder.png
-imap/imap_err.h
-imap/imap_err.c
-imap/lmtpstats.h
-imap/lmtpstats.c
-imap/pushstats.h
-imap/pushstats.c
-man/sieveshell.1
-sieve/addr.c
-sieve/addr.h
-sieve/addr-lex.c
-sieve/sieve.c
-sieve/sieve.h
-sieve/sieve-lex.c
-sieve/sieve_err.h
-sieve/sieve_err.c
diff -u cyrus21-imapd-2.1.18/install-sh cyrus21-imapd-2.1.18/install-sh
--- cyrus21-imapd-2.1.18/install-sh
+++ cyrus21-imapd-2.1.18/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-02-02.21
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
diff -u cyrus21-imapd-2.1.18/mkinstalldirs cyrus21-imapd-2.1.18/mkinstalldirs
--- cyrus21-imapd-2.1.18/mkinstalldirs
+++ cyrus21-imapd-2.1.18/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2005-02-02.21
+scriptversion=2005-06-29.22
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -12,7 +12,7 @@
 # <automake-patches@gnu.org>.
 
 errstatus=0
-dirmode=""
+dirmode=
 
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -103,13 +103,21 @@
 
 for file
 do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
   shift
+  IFS=$oIFS
 
-  pathcomp=
   for d
   do
-    pathcomp="$pathcomp$d"
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -124,7 +132,7 @@
       else
 	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-	  lasterr=""
+	  lasterr=
 	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
 	  if test ! -z "$lasterr"; then
@@ -134,7 +142,7 @@
       fi
     fi
 
-    pathcomp="$pathcomp/"
+    pathcomp=$pathcomp/
   done
 done
 
diff -u cyrus21-imapd-2.1.18/aclocal.m4 cyrus21-imapd-2.1.18/aclocal.m4
--- cyrus21-imapd-2.1.18/aclocal.m4
+++ cyrus21-imapd-2.1.18/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.