--- uw-imap-2007b~dfsg.orig/debian/po/templates.pot
+++ uw-imap-2007b~dfsg/debian/po/templates.pot
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
--- uw-imap-2007b~dfsg.orig/debian/po/ca.po
+++ uw-imap-2007b~dfsg/debian/po/ca.po
@@ -0,0 +1,162 @@
+# uw-imap (debconf) translation to Catalan.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Aleix Badia i Bosch <abadia@ica.es>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap_7:2002edebian1-1_templates\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2004-03-05 19:46GMT\n"
+"Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
+"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "pop2= El POP 2 al port de TCP 109 amb el suport de TLS. Està obsolet."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3 = El POP 3 al port de TCP 110 amb el suport de TLS."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = El POP 3 al port de TCP 995 amb el suport d'SSL."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Si dubteu escolliu el pop3 i el pop3s."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imap2 = L'IMAP 4Rev1 (no la 2, suficientment estrany) al port de TCP 143 "
+#~ "amb el suport de TLS."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "imap3 = L'IMAP 3 al port de TCP 220 amb el suport de TLS. És obsolet."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = L'IMAP 4Rev1 al port de TCP 993 amb el suport d'SSL."
+
+#, fuzzy
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Si dubteu escolliu l'imap2 i l'imaps."
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Quins ports ha d'escoltar el servidor?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Voleu continuar la instal·lació del libc-client sense el suport del "
+#~ "Maildir?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "Les versions del libc-client anteriors a la 2002d (i les versions de "
+#~ "desenvolupament del 2003) incloïen un pedaç no oficial i que ja no és "
+#~ "manté per suportar els Maildir. L'uw-imapd i l'ipopd no utilitzen els "
+#~ "Maildir per defecte, però si heu canviat la configuració del sistema o "
+#~ "d'altres programes instal·lats depenen del libc-client l'actualització "
+#~ "pot induir a errors en la gestió del correu."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Voleu continuar la instal·lació d'un libc-client sense el suport del "
+#~ "Maildir?"
+
+#~ msgid "pop2, pop3, pop3s"
+#~ msgstr "pop2, pop3, pop3s"
+
+#~ msgid "imap2, imap3, imaps"
+#~ msgstr "imap2, imap3, imaps"
--- uw-imap-2007b~dfsg.orig/debian/po/da.po
+++ uw-imap-2007b~dfsg/debian/po/da.po
@@ -0,0 +1,115 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap 2007b\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2008-07-03 23:55+0200\n"
+"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Understøttelse af porte og protokoller:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Vælg serverporte og -protokoller som skal aktiveres."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 på TCP port 110 med TLS-understøttelse;\n"
+" pop3s: POP 3 på TCP port 995 med SSL-understøttelse;\n"
+" pop2:  (forældet) POP 2 på TCP port 109 med TLS-understøttelse."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Det anbefales at aktivere både pop3 og pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Da valget af porte og protokoller kan være blevet overskygget af lokale "
+"ændringer, kan det være nødvendigt at du gennemtvinger valget og afvikler "
+"pakkeopsætningen igen med 'dpkg-reconfigure ipopd'."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Gennemtving port-valg?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "Ipopd dæmonen understøtter at lytte på flere porte samtidigt."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 på TCP port 143 med TLS-understøttelse;\n"
+" imaps: IMAP 4rev1 på TCP port 993 med SSL-understøttelse;\n"
+" imap3: (forældet) IMAP 3 på TCP port 220 med TLS-understøttelse."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Det anbefales at aktivere både imap2 og imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Da valget af porte og protokoller kan være blevet overskygget af lokale "
+"ændringer, kan det være nødvendigt at du gennemtvinger valget og afvikler "
+"pakkeopsætningen igen med 'dpkg-reconfigure uw-imapd'."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "UW-imap dæmonen understøtter at lytte på flere porte samtidigt."
--- uw-imap-2007b~dfsg.orig/debian/po/de.po
+++ uw-imap-2007b~dfsg/debian/po/de.po
@@ -0,0 +1,182 @@
+# Translation of openldap debconf templates to German
+# Copyright (C) Matthias Julius <mdeb@julius-net.net>, 2006.
+# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
+# This file is distributed under the same license as the openldap package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap 7:2006j2.dfsg-4\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-28 17:54+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
+"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Server-Ports und Protokolle, die unterstützt werden sollen:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Bitte wählen Sie die zu aktivierenden Server-Ports und Protokolle."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 auf TCP-Port 110 mit TLS-Unterstützung;\n"
+" pop3s: POP 3 auf TCP-Port 995 mit SSL-Unterstützung;\n"
+" pop2:  (veraltet) POP 2 auf TCP-Port 109 mit TLS-Unterstützung."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Es wird empfohlen, sowohl pop3 als auch pop3s zu aktivieren."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Da die Auswahl an Ports und Protokollen durch lokale Änderungen "
+"überschrieben sein könnten, müssen Sie eventuell die Auswahl erzwingen und "
+"die Paketkonfiguration mit »dpkg-reconfigure ipopd« erneut ausführen."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Port-Auswahl erzwingen?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "Der ipopd-Daemon kann auf mehreren Ports simultan auf Anfragen warten."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 auf TCP-Port 143 mit TLS-Unterstützung;\n"
+" imaps: IMAP 4rev1 auf TCP-Port 993 mit SSL-Unterstützung;\n"
+" imap3: (veraltet) IMAP 3 auf TCP-Port 220 mit TLS-Unterstützung."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Es wird empfohlen, sowohl imap2 als auch imaps zu aktivieren."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Da die Auswahl an Ports und Protokollen durch lokale Änderungen "
+"überschrieben sein könnten, müssen Sie eventuell die Auswahl erzwingen und "
+"die Paketkonfiguration mit »dpkg-reconfigure uw-imapd« erneut ausführen."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
+"Der uw-imap-Daemon kann auf mehreren Ports simultan auf Anfragen warten."
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "pop2 =  POP 2 auf TCP-Port 109 mit TLS-Unterstützung. Dies ist veraltet."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3 =  POP 3 auf TCP-Port 110 mit TLS-Unterstützung."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = POP 3 auf TCP-Port 995 mit SSL-Unterstützung."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Falls Sie sich nicht sicher sind, wählen Sie pop3 und pop3s."
+
+#~ msgid ""
+#~ "By default the port selection is respected only on initial installs, and "
+#~ "is ignored on later updates and reconfiguration."
+#~ msgstr ""
+#~ "Standardmäßig wird die Port-Auswahl nur bei der ersten Installation "
+#~ "beachtet und bei einer späteren erneuten Konfiguration ignoriert."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imap2 = IMAP 4Rev1 (nicht 2, seltsamerweise) auf TCP-Port 143 mit TLS-"
+#~ "Unterstützung."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "imap3 = IMAP 3 auf TCP-Port 220 mit TLS-Unterstützung. Dies ist veraltet."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = IMAP 4Rev1 auf TCP-Port 993 mit SSL-Unterstützung."
+
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Falls Sie sich nicht sicher sind, wählen Sie imap2 und imaps."
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Welche Ports soll der Server verwenden?"
+
+#~ msgid ""
+#~ "Do you want to ignore possible local tweaks and always use selected ports?"
+#~ msgstr ""
+#~ "Wollen Sie mögliche lokale Anpassungen ignorieren und immer die "
+#~ "ausgewählten Ports verwenden?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Die Installation von libc-client ohne Maildir-Unterstützung fortsetzen?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "Libc-client-Versionen, die älter als Version 2002d sind (und "
+#~ "Entwicklerversionen von 2003) enthielten einen nichtoffiziellen und nicht "
+#~ "mehr gepflegten Patch zur Maildir-Unterstützung. In der Voreinstellung "
+#~ "wurden Maildirs von uw-imapd oder ipopd nicht verwendet. Aber wenn Sie "
+#~ "Ihre Systemeinstellungen geändert haben oder wenn andere installierte "
+#~ "Programme von libc-client abhängen, kann das Upgrade zu einer defekten E-"
+#~ "Mail-Verarbeitung führen."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Wollen Sie die Installation von libc-client ohne Maildir-Unterstützung "
+#~ "fortsetzen?"
--- uw-imap-2007b~dfsg.orig/debian/po/cs.po
+++ uw-imap-2007b~dfsg/debian/po/cs.po
@@ -0,0 +1,174 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-21 10:29+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Protokoly a porty, které má server podporovat:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Vyberte prosím porty a protokoly, které se mají na serveru povolit."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 na TCP portu 110 s podporou TLS;\n"
+" pop3s: POP 3 na TCP portu 995 s podporou SSL;\n"
+" pop2:  (zastaralý) POP 2 na TCP portu 109 s podporou TLS."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Doporučuje se aktivovat jak pop3, tak pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Protože se může stát, že si zde nastavené porty a protokoly později "
+"přepíšete lokálními úpravami konfiguračního souboru, můžete vynutit toto "
+"nastavení spuštěním příkazu „dpkg-reconfigure ipopd“."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Vynutit výběr portů?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "Daemon ipopd umí naslouchat na více portech zároveň."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 na TCP portu 143 s podporou TLS;\n"
+" imaps: IMAP 4rev1 na TCP portu 993 s podporou SSL;\n"
+" imap3: (zastaralý) IMAP 3 na TCP portu 220 s podporou TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Doporučuje se aktivovat jak imap2, tak imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Protože se může stát, že si zde nastavené porty a protokoly později "
+"přepíšete lokálními úpravami konfiguračního souboru, můžete vynutit toto "
+"nastavení spuštěním příkazu „dpkg-reconfigure uw-imapd“."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "Daemon uw-imap umí naslouchat na více portech zároveň."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Pokud si nejste jisti, vyberte pop3 a pop3s."
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Na kterých portech má server naslouchat?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr "Pokračovat v instalaci libc-client bez podpory Maildiru?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "Libc-client dřívější než verze 2002d (a vývojové verze 2003) obsahovaly "
+#~ "neoficiální záplatu pro podporu schránek typu Maildir. Implicitně se tyto "
+#~ "schránky nepoužívaly ani v uw-imapd ani v ipopd. Pokud jste ale změnili "
+#~ "nastavení, nebo pokud na libc-client závisí jiné instalované programy, "
+#~ "tak se může stát, že aktualizace programu způsobí porušené zpracování "
+#~ "pošty."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr "Chcete pokračovat v instalaci libc-client bez podpory Maildiru?"
+
+#~ msgid "Allow insecure authentication using plaintext passwords?"
+#~ msgstr "Povolit nebezpečnou autentizaci pomocí nešifrovaných hesel?"
+
+#~ msgid ""
+#~ "The use of unencrypted plaintext passwords is generally insecure, and the "
+#~ "current version of libc-client by default only allows network access "
+#~ "through either TLS or SSL connections.  This affects uw-imapd, ipopd and "
+#~ "any other programs that use libc-client for mail access through the "
+#~ "network.  However, this functionality can be changed by using the semi-"
+#~ "official /etc/c-client.cf configuration file.  Read more about this in /"
+#~ "usr/share/doc/libc-client__VER__/README.Debian."
+#~ msgstr ""
+#~ "Použití nešifrovaných hesel je obecně nebezpečné a aktuální verze libc-"
+#~ "client dovoluje implicitně pouze přístup přes TLS nebo SSL spojení. To má "
+#~ "vliv na uw-imapd, ipopd a všechny ostatní programy, které k poště na síti "
+#~ "přistupují přes libc-client. Toto chování se dá změnit polooficiálním "
+#~ "konfiguračním souborem /etc/c-client.cf. Více se dozvíte v /usr/share/doc/"
+#~ "libc-client__VER__/README.Debian."
+
+#~ msgid ""
+#~ "Do you want to allow email access authentication using insecure plaintext "
+#~ "passwords?"
+#~ msgstr ""
+#~ "Chcete povolit autentizaci pro přístup k poště pomocí nebezpečných "
+#~ "nešifrovaných hesel?"
+
+#~ msgid "Note: cramd-md5 passwords are treated as plaintext passwords!"
+#~ msgstr "Poznámka: hesla cramd-md5 se berou jako nezašifrovaná!"
--- uw-imap-2007b~dfsg.orig/debian/po/es.po
+++ uw-imap-2007b~dfsg/debian/po/es.po
@@ -0,0 +1,136 @@
+# translation of es.po to
+# uw-imap translation to spanish
+# Copyright (C) 2004 Software in the Public Interest
+# This file is distributed under the same license as the uw-imap package.
+#
+# Changes:
+# - Initial translation
+# - Reviewed
+#
+#  Traductores, si no conoce el formato PO, merece la pena leer la
+#  documentacin de gettext, especialmente las secciones dedicadas a este
+#  formato, por ejemplo ejecutando:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+# Equipo de traduccin al espaol, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traduccin de Debian al espaol
+#   http://www.debian.org/intl/spanish/coordinacion
+#   especialmente las notas de traduccin en
+#   http://www.debian.org/intl/spanish/notas
+#
+# - La gua de traduccin de po's de debconf:
+#   /usr/share/doc/po-debconf/README-trans
+#   o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#       Carlos Galisteo de Cabo <cgalisteo@k-rolus.net>, 2004, 2007.
+#       Rubn Porras Campo <nahoo@inicia.es>, 2004.
+msgid ""
+msgstr ""
+"Project-Id-Version: es\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-17 11:17+0200\n"
+"Last-Translator: Carlos Galisteo <cgalisteo@k-rolus.net>\n"
+"Language-Team:  <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Protocolos y puertos a soportar por el servidor:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr ""
+"Por favor, elija los protocolos y los puertos a activar en el servidor."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3: POP 3 en el puerto 110 TCP con soporte para TLS;\n"
+" pop3s: POP 3 en el puerto 995 TCP con soporte para SSL;\n"
+" pop2: (obsoleto) POP 2 en el puerto 109 TCP con soporte para TLS;"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Se recomienda activar ambos, pop3 y pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Dado que la eleccin de puertos y protocolos puede modificarse mediante "
+"cambios locales, puede que necesite forzar la eleccin y volver a configurar "
+"el paquete con dpkg-reconfigure ipopd."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Desea forzar la seleccin de puerto?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "El servicio ipopd permite escuchar simultneamente en varios puertos."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 en el puerto TCP 143 con soporte para TLS;\n"
+" imaps: IMAP 4rev1 en el puerto TCP 993 con soporte para SSL;\n"
+" imap3: (obsoleto) IMAP 3 en el puerto TCP 220 con soporte para TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Se recomienda activar ambos, imap2 e imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Dado que la eleccin de puertos y protocolos puede modificarse mediante "
+"cambios locales, puede que necesite forzar la eleccin y volver a configurar "
+"el paquete con dpkg-reconfigure uw-imapd."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "El servicio ipopd permite escuchar simultneamente en varios puertos."
--- uw-imap-2007b~dfsg.orig/debian/po/fi.po
+++ uw-imap-2007b~dfsg/debian/po/fi.po
@@ -0,0 +1,107 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-17 23:24+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Tuettavat palvelinportit ja yhteyskäytännöt:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Valitse palvelinportit ja yhteyskäytännöt, jotka otetaan käyttöön."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 TCP-portissa 110 TLS-tuella\n"
+" pop3s: POP 3 TCP-portissa 995 SSL-tuella\n"
+" pop2:  (vanhentunut) POP 2 TCP-portissa 109 TLS-tuella"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "On suositeltavaa ottaa käyttöön sekä pop3 että pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Koska portti- ja yhteyskäytäntövalinnat ovat saatettu kumota paikallisilla "
+"muutoksilla, saattaa olla tarpeen pakottaa muutokset ja tehdä paketin "
+"asetukset uudelleen komennolla ”dpkg-reconfigure ipopd”."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Pakotetaanko porttivalinta?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "Taustaohjelma ipopd tukee useamman portin yhtäaikaista kuuntelua."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 TCP-portissa 143 TLS-tuella\n"
+" imaps: IMAP 4rev1 TCP-portissa 993 SSL-tuella\n"
+" imap3: (vanhentunut) IMAP 3 TCP-portissa 220 TLS-tuella"
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "On suositeltavaa ottaa käyttöön sekä imap2 että imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Koska portti- ja yhteyskäytäntövalinnat ovat saatettu kumota paikallisilla "
+"muutoksilla, saattaa olla tarpeen pakottaa muutokset ja tehdä paketin "
+"asetukset uudelleen komennolla ”dpkg-reconfigure uw-imapd”."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "Taustaohjelma uw-imap tukee useamman portin yhtäaikaista kuuntelua."
--- uw-imap-2007b~dfsg.orig/debian/po/eu.po
+++ uw-imap-2007b~dfsg/debian/po/eu.po
@@ -0,0 +1,111 @@
+# translation of uw-imap-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi@beobide.net>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap-eu\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-19 10:16+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <Librezale@librezale.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Zerbitzaria onartu behar dituen protokolo eta atakak:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Mesedez hautatu gaitu behar diren zerbitzari protokolo eta atakak."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3  TCP 110 atakan TLS onarpenarekin;\n"
+" pop3s: POP 3 TCP 995 atakan SSL onarpenarekin;\n"
+" pop2:  (zaharkiturik) POP 2 TCP 109 atakan TLS onarpenarekin."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Bai pop3 eta bai pop3s gaitzea gomendatzen da."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Ataka eta protokolo hautapena aldaketa lokalek gainidatzi daitekeenez, "
+"hautapena behartu eta pakete konfigurazioa berriz abiarazi beharko zenuke "
+"'dpkg-reconfigure ipopd' bidez."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Ataka hautapena behartu?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "ipopd deabruak batera ataka anitzetan entzutea onartzen du."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1  TCP 143 atakan TLS onarpenarekin;\n"
+" imaps: IMAP 4rev1 TCP 993 atakan SSL onarpenarekin;\n"
+" imap3: (zaharkitua) IMAP 3 TCP 220 atakan TLS onarpenarekin."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Bai imap2 eta bai imaps gaitzea gomendatzen da."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Ataka eta protokolo hautapena aldaketa lokalek gainidatzi daitekeenez, "
+"hautapena behartu eta pakete konfigurazioa berriz abiarazi beharko zenuke "
+"'dpkg-reconfigure uw-imapd' bidez."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "uw-imap deabruak batera ataka anitzetan entzutea onartzen du."
--- uw-imap-2007b~dfsg.orig/debian/po/fr.po
+++ uw-imap-2007b~dfsg/debian/po/fr.po
@@ -0,0 +1,114 @@
+# Translation of uw-imap debconf templates to French
+# Copyright (C) 2001-2007 Christian Perrier <bubulle@debian.org>
+# This file is distributed under the same license as the uw-imap package.
+#
+# Christian Perrier <bubulle@debian.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-15 07:32+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Port et protocoles à gérer sur le serveur :"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Veuillez choisir les ports et les protocoles à activer sur le serveur."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3  : POP 3 sur port TCP 110 avec gestion TLS;\n"
+" pop3s : POP 3 sur port TCP 995 avec gestion SSL;\n"
+" pop2  : (obsolète) POP 2 sur port TCP 109 avec gestion TLS."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Il est recommandé d'activer pop3 et pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Comme les ports choisis pour être activés peuvent être remplacés par des "
+"modifications locales, il est recommandé de forcer ces choix et de "
+"recommencer la configuration du paquet avec la commande « dpkg-reconfigure "
+"ipopd »."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Faut-il forcer le choix des ports ?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "Le démon ipopd peut être à l'écoute sur plusieurs ports simultanément."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2 : IMAP 4rev1 sur port TCP 143 avec gestion TLS;\n"
+" imaps : IMAP 4rev1 sur port TCP 993 avec gestion SSL;\n"
+" imap3 : (obsolète) IMAP 3 sur port TCP 220 avec gestion TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Il est recommandé d'activer imap2 et imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Comme les ports choisis pour être activés peuvent être remplacés par des "
+"modifications locales, il est recommandé de forcer ces choix et de "
+"recommencer la configuration du paquet avec la commande « dpkg-reconfigure "
+"uw-imapd »."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
+"Le démon uw-imap peut être à l'écoute sur plusieurs ports simultanément."
--- uw-imap-2007b~dfsg.orig/debian/po/gl.po
+++ uw-imap-2007b~dfsg/debian/po/gl.po
@@ -0,0 +1,163 @@
+# Galician translation of uw-imap's debconf templates
+# This file is distributed under the same license as the uw-imap package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-15 19:00+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Portos e protocolos a soportar:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Escolla os portos e protocolos a activar."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP3 no porto TCP 110 con soporte de TLS;\n"
+" pop3s: POP3 no porto TCP 995 con soporte de SSL;\n"
+" pop2:  (obsoleto) POP2 no porto TCP 109 con soporte de TLS."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Recoméndase activar pop3 e pop3s ao mesmo tempo."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Como a selección de portos e protocolos pode ter sido modificada por cambios "
+"locais, pode ter que forzar as opcións seleccionadas e executar outra vez a "
+"configuración do paquete mediante \"dpkg-reconfigure ipopd\"."
+
+# Xa sei que "enforce" non significa "forzar", pero... -- jt
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "¿Forzar a selección do porto?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "O servidor ipopd pode escoitar en varios portos ao mesmo tempo."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 no porto TCP 143 con soporte de TLS;\n"
+" imaps: IMAP 4rev1 no porto TCP 993 con soporte de SSL;\n"
+" imap3: (obsoleto) IMAP 3 no porto TCP 220 con soporte de TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Recoméndase activar imap2 e imaps ao mesmo tempo."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Como a selección de portos e protocolos pode ter sido modificada por cambios "
+"locais, pode ter que forzar as opcións seleccionadas e executar outra vez a "
+"configuración do paquete mediante \"dpkg-reconfigure uw-imapd\"."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "O servidor uw-imap pode escoitar en varios portos ao mesmo tempo."
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr "pop2  = POP 2 no porto TCP 109 con soporte de TLS. Obsoleto."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3  = POP 3 no porto TCP 110 con soporte de TLS."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = POP 3 no porto TCP 995 con soporte de SSL."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Se non está seguro, escolla pop3 e pop3s."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr "imap2 = IMAP 4Rev1 (non 2) no porto TCP 143 con soporte de TLS."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr "imap3 = IMAP 3 no porto TCP 220 con soporte de TLS. Obsoleto."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imap2 = IMAP 4Rev1 no porto TCP 993 con soporte de SSL."
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "¿En que portos debería escoitar o servidor?"
+
+#~ msgid ""
+#~ "Do you want to ignore possible local tweaks and always use selected ports?"
+#~ msgstr ""
+#~ "¿Quere ignorar os posibles axustes locais e empregar sempre os portos "
+#~ "seleccionados?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr "¿Seguir a instalar libc-client sen soporte de Maildir?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "As versións de libc-client anteriores á 2002d (e as versións de "
+#~ "desenvolvemento da 2003) incluían un parche non oficial e que xa non se "
+#~ "mantén para soportar Maildirs. Os Maildirs non os empregaba por defecto "
+#~ "uw-imapd nin ipopd, pero se cambiou a configuración do sistema ou outros "
+#~ "programas instalados dependen de libc-client, a xestión do correo pode "
+#~ "fallar trala actualización."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr "¿Quere seguir instalando libc-client sen soporte de Maildir?"
--- uw-imap-2007b~dfsg.orig/debian/po/ja.po
+++ uw-imap-2007b~dfsg/debian/po/ja.po
@@ -0,0 +1,118 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-16 23:40+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "サポートするサーバのポートおよびプロトコル:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "有効にするサーバのポートおよびプロトコルを選んでください。"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  TLS サポート付き TCP ポート 110 上の POP 3;\n"
+" pop3s: SSL サポート付き TCP ポート 995 上の POP 3;\n"
+" pop2:  (時代遅れ) TLS サポート付き TCP ポート 109 上の POP 2。"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "pop3 と pop3s の両方を有効にすることをお勧めします。"
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"ポートおよびプロトコルの選択はローカルの変更を上書きする可能性があるの"
+"で、'dpkg-reconfigure ipopd' で再度選択とパッケージ設定を実行する必要があるか"
+"もしれません。"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "ポートの選択を強制しますか?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "ipopd デーモンは複数のポートの同時監視をサポートします。"
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2:  TLS サポート付き TCP ポート 143 上の IMAP 4rev1;\n"
+" imaps:  SSL サポート付き TCP ポート 993 上の IMAP 4rev1;\n"
+" imap3:  (時代遅れ) TLS サポート付き TCP ポート 220 上の IMAP 3。"
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "imap2 と imaps の両方を有効にすることをお勧めします。"
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"ポートおよびプロトコルの選択はローカルの変更を上書きする可能性があるの"
+"で、'dpkg-reconfigure uw-imapd' で再度選択とパッケージ設定を実行する必要があ"
+"るかもしれません。<"
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "uw-imap デーモンは複数のポートの同時監視をサポートします。"
--- uw-imap-2007b~dfsg.orig/debian/po/it.po
+++ uw-imap-2007b~dfsg/debian/po/it.po
@@ -0,0 +1,114 @@
+# Italian translation of the uw-imapd debconf templates
+# This file is distributed under the same license as the uw-imapd package
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# Luca Monducci <luca.mo@tiscali.it>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imapd debconf templates\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-26 22:42+0200\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Porte e protocolli del server da supportare:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Selezionare quali porte e protocolli del server attivare."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 sulla porta TCP 110 con supporto TLS;\n"
+" pop3s: POP 3 sulla porta TCP 995 con supporto SSL;\n"
+" pop2:  (obsoleto) POP 2 sulla porta TCP 109 con supporto TLS."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Si raccomanda di attivare pop3 e pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Dato che la scelta di porte e protocolli potrebbe essere stata modificata da "
+"configurazioni locali, per applicare la scelta potrebbe essere necessario "
+"eseguire nuovamente la configurazione del pacchetto con \"dpkg-reconfigure "
+"ipopd\"."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Applicare la scelta delle porte?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr ""
+"Il demone ipopd si può mettere in ascolto simultaneamente su più porte."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 sulla porta TCP 143 con supporto TLS;\n"
+" imaps: IMAP 4rev1 sulla porta TCP 993 con supporto SSL;\n"
+" imap3: (obsoleto) IMAP 3 sulla porta TCP 220 con supporto TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Si raccomanda di attivare imap2 e imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Dato che la scelta di porte e protocolli potrebbe essere stata modificata da "
+"configurazioni locali, per applicare la scelta potrebbe essere necessario "
+"eseguire nuovamente la configurazione del pacchetto con \"dpkg-reconfigure "
+"uw-imapd\"."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
+"Il demone uw-imap si può mettere in ascolto simultaneamente su più porte."
--- uw-imap-2007b~dfsg.orig/debian/po/nl.po
+++ uw-imap-2007b~dfsg/debian/po/nl.po
@@ -0,0 +1,185 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap 7:2002edebian1-13\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2006-04-21 21:00+0100\n"
+"Last-Translator: Vincent Zweije <zweije@xs4all.nl>\n"
+"Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Gekozen poorten afdwingen?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "pop2 = POP 2 op TCP poort 109 met TLS-ondersteuning. Dit is verouderd."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3 = POP 3 op TCP poort 110 met TLS-ondersteuning."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = POP 3 op TCP poort 995 met SSL-ondersteuning."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Als u twijfelt, kies dan pop3 en pop3s."
+
+#, fuzzy
+#~| msgid ""
+#~| "The ports selected for enabling may be overridden by locally configured "
+#~| "services. By default the port selection is respected only on initial "
+#~| "installs, and is ignored on later reconfiguration."
+#~ msgid ""
+#~ "By default the port selection is respected only on initial installs, and "
+#~ "is ignored on later updates and reconfiguration."
+#~ msgstr ""
+#~ "Locaal ingestelde diensten kunnen voorgaan op de poorten die handmatig "
+#~ "zijn ingesteld. Standaard worden de handmatig ingestelde poorten alleen "
+#~ "gebruikt bij de eerste installatie, maar niet bij latere herconfiguratie."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imap2 = IMAP 4Rev1 (merkwaardigerwijs niet 2) op TCP poort 143 met TLS-"
+#~ "ondersteuning."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "imap3 = IMAP 3 op TCP poort 220 met TLS-ondersteuning. Dit is verouderd."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = IMAP 4Rev1 op TCP poort 993 met SSL-ondersteuning."
+
+#, fuzzy
+#~| msgid "If in doubt, pick imap2 and imaps."
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Als u twijfelt, kies dan imap2 en imaps."
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Op welke poorten moet de server luisteren?"
+
+#~ msgid ""
+#~ "Do you want to ignore possible local tweaks and always use selected ports?"
+#~ msgstr ""
+#~ "Wilt u mogelijke locale instellingen negeren en altijd de geselecteerde "
+#~ "poorten gebruiken?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Verder gaan met het installeren van libc-client zonder Maildir-"
+#~ "ondersteuning?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "Libc-client versies voor 2002d (en ontwikkelaarsversies van 2003) "
+#~ "bevatten een onofficile en niet langer ondersteunde wijziging om "
+#~ "Maildirs te ondersteunen. Standaard werden Maildirs niet gebruikt door uw-"
+#~ "imapd of ipopd, maar indien u uw systeeminstellingen hebt gewijzigd of "
+#~ "programma's hebt genstalleerd die afhankelijk zijn van libc-client, dan "
+#~ "kan mail-afhandeling door de opwaardering defect raken."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Wilt u doorgaan met het installeren van een libc-client zonder Maildir-"
+#~ "ondersteuning?"
--- uw-imap-2007b~dfsg.orig/debian/po/pt.po
+++ uw-imap-2007b~dfsg/debian/po/pt.po
@@ -0,0 +1,187 @@
+# Portuguese translation for uw-imap's debconf templates
+# Copyright (C) 2007 Miguel Figueiredo <elmig@debianpt.org>
+# This file is distributed under the same license as the uw-imap package.
+# Miguel Figueiredo <elmig@debianpt.org>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-16 19:23+0100\n"
+"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Portos e protocolos do servidor a suportar:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Por favor escolha os portos e protocolos do servidor a activar."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 no porto TCP 110 com suporte para TLS;\n"
+" pop3s: POP 3 no porto TCP 995 com suporte para SSL;\n"
+" pop2:  (obsoleto) POP 2 no porto TCP 109 com suporte para TLS."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "É recomendado activar pop3 e pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Como a escolha de portos e de protocolos pode ter sido ultrapassada por "
+"alterações locais, pode necessitar de reforçar a escolha e correr novamente "
+"a configuração do pacote com 'dpkg-reconfigure ipopd'."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Reforçar a selecção dos portos?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "O daemon ipopd suporta escutar simultâneamente em vários portos."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 no porto TCP 143 com suporte para TLS;\n"
+" imaps: IMAP 4rev1 no porto TCP 993 com suporte para SSL;\n"
+" imap3: (obsoleto) IMAP 3 no porto 220 TCP com suporte para TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "É recomendado activar imap2 e imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Como a escolha de portos e de protocolos pode ter sido ultrapassada por "
+"alterações locais, pode necessitar de reforçar a escolha e correr novamente "
+"a configuração do pacote com 'dpkg-reconfigure uw-imapd'."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "O daemon uw-imap suporta escutar simultâneamente em vários portos."
+
+#~ msgid "Wanted server ports:"
+#~ msgstr "Portos do servidor desejados:"
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr "pop2 = POP 2 no porto TCP 109 com suporte a TLS.  Isto é obsoleto."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3 = POP 3 no porto TCP 110 com suporte a TLS."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = POP3 no porto TCP 995 com suporte a SSL."
+
+#~ msgid ""
+#~ "Confusingly, the choice of ports made with this package may have been "
+#~ "overridden by locally configured services (or by a broken package)."
+#~ msgstr ""
+#~ "Confusamente, a escolha dos portos feita por este pacote pode ser sido "
+#~ "ultrapassada por serviços configurados localmente (ou por algum pacote "
+#~ "defeituoso)."
+
+#~ msgid ""
+#~ "If you want to enforce your choice of ports made with this package, "
+#~ "disregarding any local changes, then you need to *both* select ports "
+#~ "*and* enforce the selection."
+#~ msgstr ""
+#~ "Se deseja reforçar a sua escolha de portos feita por este pacote, "
+#~ "ignorando quaisquer modificações locais, então tem fazer *ambos* os "
+#~ "passos: escolher portos *e* reforçar a selecção."
+
+#~ msgid ""
+#~ "To make sure you've done both, you can run the following command after "
+#~ "finishing your current installation/reconfiguration:"
+#~ msgstr ""
+#~ "Para ter a certeza de que fez ambos, pode correr o seguinte comando após "
+#~ "terminar a sua actual instalação/reconfiguração:"
+
+#~ msgid "dpkg-reconfigure -plow ipopd"
+#~ msgstr "dpkg-reconfigure -plow ipopd"
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Em caso de dúvida, escolha pop3 e pop3s."
+
+#~ msgid ""
+#~ "Confusingly, the choice of ports made with this package may have been "
+#~ "overridden by locally configured services (and by broken packages messing "
+#~ "with the configuration in a bad way)."
+#~ msgstr ""
+#~ "Confusamente, a escolha dos portos feita por este pacote pode ser sido "
+#~ "ultrapassada por serviços configurados localmente (e por pacotes "
+#~ "defeituosos que mexem na configuração de uma forma incorrecta)."
+
+#~ msgid ""
+#~ "By default the port selection is respected only on initial installs, and "
+#~ "is ignored on later updates and reconfiguration."
+#~ msgstr ""
+#~ "Por omissão a escolha do porto é respeitada apenas nas instalações "
+#~ "iniciais, e é ignorada em actualizações e reconfigurações posteriores."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imap2 = IMAP 4rev1 (não 2, por estranho que pareça) no porto TCP 143 com "
+#~ "suporte a TLS."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr "imap3 = IMAP3 no porto TCP 200 com suporte a TLS.  Isto é obsoleto."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = IMAP 4Rev1 no porto TCP 993 com suporte a SSL."
+
+#~ msgid "dpkg-reconfigure -plow uw-imapd"
+#~ msgstr "dpkg-reconfigure -plow uw-imapd"
+
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Em caso de dúvida, escolha imap2 e imaps."
--- uw-imap-2007b~dfsg.orig/debian/po/ru.po
+++ uw-imap-2007b~dfsg/debian/po/ru.po
@@ -0,0 +1,114 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 7:2006j2.dfsg-4\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-16 21:20+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Порты и протоколы сервера, которые нужно поддерживать:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr ""
+"Укажите номера портов и протоколы сервера, которые должны быть активированы."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 с поддержкой TLS на TCP-порту 110;\n"
+" pop3s: POP 3 с поддержкой SSL на TCP-порту 995;\n"
+" pop2:  (устарел) POP 2 с поддержкой TLS на TCP-порту 109."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Рекомендуется включить pop3 и pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Так как номера портов и протоколы, выбранные здесь, могут быть изменены "
+"вручную, вы можете повторить выбор снова, запустив настройку пакета с "
+"помощью команды 'dpkg-reconfigure ipopd'."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Работать только на указанных портах?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "Демон ipopd может работать одновременно на нескольких портах."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 с поддержкой TLS на TCP-порту 143;\n"
+" imaps: IMAP 4rev1 с поддержкой SSL на TCP-порту 993;\n"
+" imap3: (устарел) IMAP3 с поддержкой TLS на TCP-порту 220."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Рекомендуется включить imap2 и imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Так как номера портов и протоколы, выбранные здесь, могут быть изменены "
+"вручную, вы можете повторить выбор снова, запустив настройку пакета с "
+"помощью команды 'dpkg-reconfigure uw-imapd'."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "Демон uw-imap может работать одновременно на нескольких портах."
--- uw-imap-2007b~dfsg.orig/debian/po/sv.po
+++ uw-imap-2007b~dfsg/debian/po/sv.po
@@ -0,0 +1,186 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-15 15:17+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Serverportar och protokoll att ge std fr:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Vlj serverportarna och protokollen att aktivera."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 p TCP-port 110 med TLS-std;\n"
+" pop3s: POP 3 p TCP-port 995 med SSL-std;\n"
+" pop2:  (frldrad) POP 2 p TCP-port 109 med TLS-std."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Det r rekommenderat att aktivera bde pop3 och pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Eftersom val av portar och protokoll kan sidosttas av lokala ndringar, "
+"kan du behva tvinga igenom valet och kra paketkonfigurationen igen med "
+"\"dpkg-reconfigure ipopd\"."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Framtvinga portval?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "Demonen ipopd har std fr att lyssna p flera portar samtidigt."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 p TCP-port 143 med TLS-std;\n"
+" imaps: IMAP 4rev1 p TCP-port 993 med SSL-std;\n"
+" imap3: (frldrad) IMAP 3 p TCP-port 220 med TLS-std."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Det r rekommenderat att aktivera bde imap2 och imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Eftersom val av portar och protokoll kan sidosttas av lokala ndringar, "
+"kan du behva tvinga igenom valet och kra paketkonfigurationen igen med "
+"\"dpkg-reconfigure uw-imapd\"."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "Demonen uw-imap har std fr att lyssna p flera portar samtidigt."
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr "pop2 =  POP 2 p TCP port 109 med TLS-std.  Denna r frldrad."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3  = POP 3 p TCP port 110 med TLS-std."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = POP 3 p TCP port 995 med SSL-std."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Om du r osker, vlj pop3 och pop3s."
+
+#, fuzzy
+#~ msgid ""
+#~ "By default the port selection is respected only on initial installs, and "
+#~ "is ignored on later updates and reconfiguration."
+#~ msgstr ""
+#~ "Portarna som valts fr aktivering kan kras ver av lokalt konfigurerade "
+#~ "tjnster. Som standard respekteras portvalen bara vid initiella "
+#~ "installation och ignoreras senare vid omkonfigurationer."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imap2 = IMAP 4Rev1 (inte 2, konstigt nog) p TCP port 143 med TLS std."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr "imap3 = IMAP 3 p TCP port 220 med TLS-std.  Denna r frldrad."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = IMAP 4Rev1 p TCP port 993 med SSL-std."
+
+#, fuzzy
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Om du r osker, vlj imap2 och imaps."
+
+#, fuzzy
+#~ msgid ""
+#~ "You can choose to ignore possible local tweaks and always use selected "
+#~ "ports."
+#~ msgstr ""
+#~ "Vill du ignorera tnkbara lokala ndringar och alltid anvnda de valda "
+#~ "portarna?"
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Vilka portar ska servern lyssna p?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr "Fortstta installera libc-klienten utan Maildir-std?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "Libc-klienten fre version 2002d (och utvecklingsversioner av 2003) "
+#~ "inkluderar en icke officiell och inte lngre omsktt patch fr att stda "
+#~ "Maildirs. Dom standard anvndes inte Maildir av uw-imapd eller ipopd men "
+#~ "om du har ndrat din systemkonfiguration eller andra installerade program "
+#~ "har beroende av libc-klienten s kan uppgraderingen resultera i att e-"
+#~ "posthanteringen bryts."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr "Vill du fortstta installera en libc-klient utan Maildir-std?"
--- uw-imap-2007b~dfsg.orig/debian/po/tr.po
+++ uw-imap-2007b~dfsg/debian/po/tr.po
@@ -0,0 +1,226 @@
+# Turkish translation of uw-imap.
+# This file is distributed under the same license as the uw-imap package.
+# Mehmet Türker <mturker@innova.com.tr>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-16 13:57+0200\n"
+"Last-Translator: Mehmet Türker <mturker@innova.com.tr>\n"
+"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Desteklenecek sunucu port ve protokolleri:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Etkinleştirilecek sunucu port ve protokollerini seçin."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  TCP port 110 da TLS desteği ile çalışan POP 3;\n"
+" pop3s:  TCP port 995 te SSL desteği ile çalışan POP 3;\n"
+" pop2:  TCP port 109 da TLS desteği ile çalışan (demode) POP 2."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Hem pop3 hem de pop3s 'in etkinleştirilmesi tavsiye edilir."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Port ve protokol seçenekleri yerel değişiklikler sebebiyle "
+"kaybolabileceğinden, seçenekleri mecbur kılmanız ve yapılandırmayı 'dpkg-"
+"reconfigure ipopd' komutuyla tekrarlamanız gerekebilir."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Port seçimini mecbur kıl?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr ""
+"Ipopd servisi aynı anda birden fazla portta dinleme yapma yeteneğindedir."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: TCP port 143 te TLS desteği ile çalışan IMAP 4rev1;\n"
+" imaps: TCP port 993 te SSL desteği ile çalışan IMAP 4rev1;\n"
+" imap3: TCP port 220 de TLS desteği ile çalışan (demode) IMAP 3."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Hem imap2 hem de imaps etkinleştirilmesi tavsiye edilir."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Port ve protokol seçenekleri yerel değişiklikler sebebiyle "
+"kaybolabileceğinden, seçenekleri mecbur kılmanız ve yapılandırmayı 'dpkg-"
+"reconfigure uw-imapd' komutuyla tekrarlamanız gerekebilir."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
+"Uw-imap servisi aynı anda birden fazla portta dinleme yapma yeteneğindedir."
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "pop2 =  TCP port 109 üzerinde TLS desteğiyle POP 2.  Bu ayar artık "
+#~ "eskimiştir."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3  = TCP port 110 üzerinde TLS desteği ile POP 3."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = TCP port 995 üzerinde SSL desteği ile POP 3."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Eğer kararsız kaldıysanız, pop3 ve pop3s'i seçiniz."
+
+#, fuzzy
+#~ msgid ""
+#~ "By default the port selection is respected only on initial installs, and "
+#~ "is ignored on later updates and reconfiguration."
+#~ msgstr ""
+#~ "Etkinleştirmek üzere seçilen portlar yerel olarak yapılandırılan "
+#~ "servisler tarafından değiştirilmiş olabilir. Öntanımlı olarak, port "
+#~ "seçimi sadece ilk kurulumlar için geçerlidir ve sonraki yapılandırmalarda "
+#~ "dikkate alınmaz."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imap2 = TCP port 143 üzerinde TLS desteğiyle IMAP 4Rev1 (tuhaf şekilde, 2 "
+#~ "değil)."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr ""
+#~ "imap3 = TCP port 220 üzerinde TLS desteğiyle IMAP 3.  Bu ayar artık "
+#~ "eskimiştir."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = TCP port 993 üzerinde SSL desteğiyle IMAP 4Rev1."
+
+#, fuzzy
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Eğer kararsız kaldıysanız, imap2 ve imaps'i seçin."
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Sunucu hangi portları dinlemeli?"
+
+#~ msgid ""
+#~ "Do you want to ignore possible local tweaks and always use selected ports?"
+#~ msgstr ""
+#~ "Mümkün olan yerel iyileştirme ayarlarını yoksaymayı ve herzaman seçilen "
+#~ "portları kullanmak istiyormusun?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr ""
+#~ "\"libc-client\" kurulumuna Maildir desteği olmadan devam edilsin mi?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "Sürüm 2002d'den daha yeni libc-client (ve 2003'ün geliştirme sürümleri) "
+#~ "resmî olmayan ve Maildir desteği için artık desteklenmeyen bir yama "
+#~ "içeriyordu.  Uw-imapd veya ipod öntanımlı olarak Maildir biçemini "
+#~ "kullanmıyordu.  Fakat eğer sistem yapılandırmanızı değiştirdiyseniz veya "
+#~ "libc-client'a bağımlı uygulamalar kurduysanız güncelleştirme bozuk bir e-"
+#~ "posta yönetimine yol açabilir."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr ""
+#~ "\"libc-client\" kurulumuna Maildir desteği olmadan devam etmek "
+#~ "istermisiniz?"
+
+#~ msgid "pop2, pop3, pop3s"
+#~ msgstr "pop2, pop3, pop3s"
+
+#~ msgid "imap2, imap3, imaps"
+#~ msgstr "imap2, imap3, imaps"
+
+#~ msgid "Allow insecure authentication using plaintext passwords?"
+#~ msgstr ""
+#~ "Düz metin parolaları kullanarak güvenli olmayan kimlik doğrulamaya izin "
+#~ "verilsin mi?"
+
+#~ msgid ""
+#~ "The use of unencrypted plaintext passwords is generally insecure, and the "
+#~ "current version of libc-client by default only allows network access "
+#~ "through either TLS or SSL connections.  This affects uw-imapd, ipopd and "
+#~ "any other programs that use libc-client for mail access through the "
+#~ "network.  However, this functionality can be changed by using the semi-"
+#~ "official /etc/c-client.cf configuration file.  Read more about this in /"
+#~ "usr/share/doc/libc-client__VER__/README.Debian."
+#~ msgstr ""
+#~ "Şifrelenmemiş düz metin parolalarının kullanımı genellikle güvenli "
+#~ "değildir ve libc-client'ın yürürlükteki sürümü öntanımlı olarak ağa "
+#~ "ulaşmak için sadece TLS veya SSL bağlantılara izin vermektedir.  Bu "
+#~ "durum; uw-imapd, ipopd ve ağ üzerinde e-posta girişi için libc-client'i "
+#~ "kullanan bütün diğer uygulamaları da etkiler.  Bununla birlikte bu işlev "
+#~ "yarı-resmî /etc/c-client.cf yapılandırma dosyası kullanılarak "
+#~ "değiştirilebilir.  Bu konu hakkında /usr/share/doc/libc-client__VER__/"
+#~ "README.Debian dosyasında daha fazla bilgi bulabilirsiniz."
+
+#~ msgid ""
+#~ "Do you want to allow email access authentication using insecure plaintext "
+#~ "passwords?"
+#~ msgstr ""
+#~ "Güvenli olmayan düz metin parolalarını kullanarak e-posta giriş "
+#~ "doğrulaması yapılmasına izin verilsin mi?"
+
+#~ msgid "Note: cramd-md5 passwords are treated as plaintext passwords!"
+#~ msgstr "Not: cramd-md5 parolaları düz metin parolalar gibi işlem görür!"
--- uw-imap-2007b~dfsg.orig/debian/po/vi.po
+++ uw-imap-2007b~dfsg/debian/po/vi.po
@@ -0,0 +1,183 @@
+# Vietnamese translation for UW-IMAP.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap 7:2006j2.dfsg-4\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2007-10-16 23:38+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Các cổng máy phục vụ và giao thức cần hỗ trợ :"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Hãy chọn những cổng máy phục vụ và giao thức đều cần kích hoạt."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+"  • pop3:  POP 3 trên TCP cổng 110 có hỗ trợ TLS;\n"
+"  • pop3s: POP 3 trên TCP cổng 995 có hỗ trợ SSL;\n"
+"  • pop2:  (cũ) POP 2 trên TCP cổng 109 có hỗ trợ TSL."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "Khuyên bạn kích hoạt cả hai pop3 và pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Vì các cổng và giao thức được chọn có thể bị ghi đè bởi thay đổi cục bộ, bạn "
+"có thể cần phải ép buộc sự chọn và chạy lại tiến trình cấu hình gói bằng "
+"lệnh « dpkg-reconfigure ipopd »."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Ép buộc chọn cổng không?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr ""
+"Trình nền ipopd hỗ trợ khả năng lắng nghe đồng thời trên vài cổng khác nhau."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" • imap2: IMAP 4rev1 trên TCP cổng 143 có hỗ trợ TLS;\n"
+" • imaps: IMAP 4rev1 trên TCP cổng 993 có hỗ trợ SSL;\n"
+" • imap3: (cũ) IMAP 3 trên TCP cổng 220 có hỗ trợ TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "Khuyên bạn kích hoạt cả hai imap2 và imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Vì các cổng và giao thức được chọn có thể bị ghi đè bởi thay đổi cục bộ, bạn "
+"có thể cần phải ép buộc sự chọn và chạy lại tiến trình cấu hình gói bằng "
+"lệnh « dpkg-reconfigure uw-imapd »."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr ""
+"Trình nền uw-imap hỗ trợ khả năng lắng nghe đồng thời trên vài cổng khác "
+"nhau."
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr "pop2 = POP 2 trên cổng TCP 109 với sự hỗ trợ TLS. Nó quá thời."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3 = POP 3 trên cổng TCP 110 với sự hỗ trợ TLS."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = POP 3 trên cổng TCP 995 với sự hỗ trợ SSL."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Nếu chưa chắc thì hãy chọn pop3 và pop3s."
+
+#~ msgid ""
+#~ "By default the port selection is respected only on initial installs, and "
+#~ "is ignored on later updates and reconfiguration."
+#~ msgstr ""
+#~ "Mặc định là sự chọn cổng được thực hiện chỉ trong tiến trình cài đặt đầu "
+#~ "tiên, bị bỏ qua trong tiến trình nâng cấp và cấu hình lại về sau."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imap2 = IMAP 4Rev1 (không phải 2, mà lạ) trên cổng TCP 143 với sự hỗ trợ "
+#~ "TLS."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr "imap3 = IMAP 3 trên cổng TCP 220 với sự hỗ trợ TLS. Nó quá thời."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = IMAP 4Rev1 trên cổng TCP 993 với sự hỗ trợ SSL."
+
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Chưa chắc thì chọn imap2 và imaps."
+
+#~ msgid ""
+#~ "You can choose to ignore possible local tweaks and always use selected "
+#~ "ports."
+#~ msgstr ""
+#~ "Bạn có thể chọn bỏ qua cách điều chỉnh cục bộ có thể, và luôn luôn dùng "
+#~ "những cổng được chọn."
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Trình phục vụ nên lắng nghe những cổng nào?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Tiếp tục cài đặt khách « libc-client » không có hỗ trợ Maildir không?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "Trình khách « libc-client » trước phiên bản 2002d (và các phiên bản phát "
+#~ "triển trong năm 2003) bao gồm một đắp vá không chính thức và không còn "
+#~ "được bảo quản lại, để hỗ trợ các Maildir. Mặc định là hai trình nền uw-"
+#~ "imapd và ipopd không dùng Maildir, nhưng mà nếu bạn đã sửa đổi cấu hình "
+#~ "hệ thống, hoặc nếu chương trình đã cài đặt khác còn phụ thuộc vào « libc-"
+#~ "client » thì việc nâng cấp có thể hỏng khả năng quản lý thư tin."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Bạn có muốn tiếp tục cài đặt một trình khách « libc-client » không có sự "
+#~ "hỗ trợ Maildir không?"
--- uw-imap-2007b~dfsg.orig/debian/po/POTFILES.in
+++ uw-imap-2007b~dfsg/debian/po/POTFILES.in
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] ipopd.templates
+[type: gettext/rfc822deb] uw-imapd.templates
--- uw-imap-2007b~dfsg.orig/debian/po/pt_BR.po
+++ uw-imap-2007b~dfsg/debian/po/pt_BR.po
@@ -0,0 +1,228 @@
+# uw-imap Brazilian Portuguese translation
+# Copyright (c) 2007 André Luís Lopes
+# This file is distributed under the same license as the uw-imapd package.
+# André Luís Lopes <andrelop@debian.org>, 2007.
+# Eder L. Marques (frolic) <frolic@debian-ce.org>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uw-imap\n"
+"Report-Msgid-Bugs-To: dr@jones.dk\n"
+"POT-Creation-Date: 2007-10-19 20:29+0200\n"
+"PO-Revision-Date: 2008-03-04 14:23-0300\n"
+"Last-Translator: Eder L. Marques (frolic) <frolic@debian-ce.org>\n"
+"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Server ports and protocols to support:"
+msgstr "Portas do servidor e protocolos a serem suportados:"
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001 ../uw-imapd.templates:2001
+msgid "Please choose the server ports and protocols to activate."
+msgstr "Por favor, escolha as portas do servidor e protocolos para ativação."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid ""
+" pop3:  POP 3 on TCP port 110 with TLS support;\n"
+" pop3s: POP 3 on TCP port 995 with SSL support;\n"
+" pop2:  (obsolete) POP 2 on TCP port 109 with TLS support."
+msgstr ""
+" pop3:  POP 3 na porta TCP 110 com suporte a TLS;\n"
+" pop3s: POP 3 na porta TCP 995 com suporte a SSL;\n"
+" pop2:  (obsoleto) POP 2 na porta TCP 109 com suporte a TLS."
+
+#. Type: multiselect
+#. Description
+#: ../ipopd.templates:2001
+msgid "It is recommended to activate both pop3 and pop3s."
+msgstr "É recomendado ativar ambos pop3 e pop3s."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:2001 ../ipopd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure ipopd'."
+msgstr ""
+"Como a escolha de portas e protocolos pode ser sobrescrita por modificações "
+"locais, você pode ter que reforçar a escolha e executar novamente a "
+"configuração do pacote com 'dpkg-reconfigure ipopd'."
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001 ../uw-imapd.templates:3001
+msgid "Enforce port selection?"
+msgstr "Forçar seleção de porta?"
+
+#. Type: boolean
+#. Description
+#: ../ipopd.templates:3001
+msgid "The ipopd daemon supports listening simultaneously on several ports."
+msgstr "O daemon ipopd suporta escutar simultaneamente em diversas portas."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid ""
+" imap2: IMAP 4rev1 on TCP port 143 with TLS support;\n"
+" imaps: IMAP 4rev1 on TCP port 993 with SSL support;\n"
+" imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support."
+msgstr ""
+" imap2: IMAP 4rev1 na porta TCP 143 com suporte a TLS;\n"
+" imaps: IMAP 4rev1 na porta TCP 993 com suporte a SSL;\n"
+" imap3: (obsoleto) IMAP 3 na porta TCP 220 com suporte a TLS."
+
+#. Type: multiselect
+#. Description
+#: ../uw-imapd.templates:2001
+msgid "It is recommended to activate both imap2 and imaps."
+msgstr "É recomendado ativar ambos imap2 e imaps."
+
+#. Type: multiselect
+#. Description
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:2001 ../uw-imapd.templates:3001
+msgid ""
+"As the ports and protocols choice may have been overridden by local changes, "
+"you may need to enforce the choice and run the package configuration again "
+"with 'dpkg-reconfigure uw-imapd'."
+msgstr ""
+"Como a escolha de portas e protocolos pode ser sobrescrita por modificações "
+"locais, você pode ter que reforçar a escolha e executar novamente a "
+"configuração do pacote com 'dpkg-reconfigure uw-imapd'."
+
+#. Type: boolean
+#. Description
+#: ../uw-imapd.templates:3001
+msgid "The uw-imap daemon supports listening simultaneously on several ports."
+msgstr "O daemon uw-imap suporta escutar simultaneamente em diversas portas."
+
+#~ msgid "pop2 =  POP 2 on TCP port 109 with TLS support.  This is obsolete."
+#~ msgstr "pop2 = POP 2 na porta TCP 109 com suporte TLS. Isto é obsoleto."
+
+#~ msgid "pop3  = POP 3 on TCP port 110 with TLS support."
+#~ msgstr "pop3 = POP 3 na porta TCP 110 com suporte TLS."
+
+#~ msgid "pop3s = POP 3 on TCP port 995 with SSL support."
+#~ msgstr "pop3s = POP 3 na porta TCP 995 com suporte SSL."
+
+#~ msgid "If in doubt, choose pop3 and pop3s."
+#~ msgstr "Em caso de dúvidas, escolha pop3 e pop3s."
+
+#, fuzzy
+#~| msgid ""
+#~| "The ports selected for enabling may be overridden by locally configured "
+#~| "services. By default the port selection is respected only on initial "
+#~| "installs, and is ignored on later reconfiguration."
+#~ msgid ""
+#~ "By default the port selection is respected only on initial installs, and "
+#~ "is ignored on later updates and reconfiguration."
+#~ msgstr ""
+#~ "As portas selecionadas para serem habilitadas podem se sobrescritas por "
+#~ "serviços configurados localmente. Por padrão, a seleção de portas é "
+#~ "respeitada somente em instalações iniciais e é ignorada em "
+#~ "reconfigurações posteriores."
+
+#~ msgid ""
+#~ "imap2 = IMAP 4Rev1 (not 2, strangely enough) on TCP port 143 with TLS "
+#~ "support."
+#~ msgstr ""
+#~ "imapd2 = IMAP 4Rev1 (não 2, estranho o bastante) na porta TCP 143 com "
+#~ "suporte TLS."
+
+#~ msgid "imap3 = IMAP 3 on TCP port 220 with TLS support.  This is obsolete."
+#~ msgstr "imap3 = IMAP 3 na porta TCP 220 com suporte TLS. Isto é obsoleto."
+
+#~ msgid "imaps = IMAP 4Rev1 on TCP port 993 with SSL support."
+#~ msgstr "imaps = IMAP 4Rev1 na porta TCP 993 com suporte SSL."
+
+#, fuzzy
+#~| msgid "If in doubt, pick imap2 and imaps."
+#~ msgid "If in doubt, choose imap2 and imaps."
+#~ msgstr "Em caso de dúvidas, escolha imap2 e imaps"
+
+#~ msgid "Which ports should the server listen on?"
+#~ msgstr "Em quais portas o servidor deve ouvir ?"
+
+#~ msgid ""
+#~ "Do you want to ignore possible local tweaks and always use selected ports?"
+#~ msgstr ""
+#~ "Você deseja ignorar possíveis mudanças locais e sempre utilizar as portas "
+#~ "selecionadas?"
+
+#~ msgid "Continue installing libc-client without Maildir support?"
+#~ msgstr "Continuar instalando a libc-client sem suporte a Maildir?"
+
+#~ msgid ""
+#~ "Libc-client earlier than version 2002d (and development versions of 2003) "
+#~ "included an unofficial and no longer maintained patch to support "
+#~ "Maildirs. By default Maildirs were not used by uw-imapd or ipopd, but if "
+#~ "you have changed your system configuration or other installed programs "
+#~ "depend on libc-client then upgrading may result in broken mail handling."
+#~ msgstr ""
+#~ "A libc-client anterior a versão 2002d (e versões de desenvolvimento de "
+#~ "2003) incluíam um patch não oficial e não mais mantido para suportar "
+#~ "Maildirs. Por padrão, Maildirs não eram utilizados pelo uw-imapd ou pelo "
+#~ "ipopd, mas caso você tenha mudado a configuração de seu sistema ou outros "
+#~ "programas instalados dependam da libc-client, essa atualização pode "
+#~ "resultar em um gerenciamento de mensagens deficiente."
+
+#~ msgid ""
+#~ "Do you want to continue installing a libc-client without Maildir support?"
+#~ msgstr ""
+#~ "Você deseja continuar instalando a libc-client sem suporte a Maildir?"
+
+#~ msgid "pop2, pop3, pop3s"
+#~ msgstr "pop2, pop3, pop3s"
+
+#~ msgid "imap2, imap3, imaps"
+#~ msgstr "imap2, imap3, imaps"
+
+#, fuzzy
+#~ msgid ""
+#~ "The use of unencrypted plaintext passwords is generally insecure, and the "
+#~ "current version of libc-client by default only allows network access "
+#~ "through either TLS or SSL connections.  This affects uw-imapd, ipopd and "
+#~ "any other programs that use libc-client for mail access through the "
+#~ "network.  However, this functionality can be changed by using the semi-"
+#~ "official /etc/c-client.cf configuration file.  Read more about this in /"
+#~ "usr/share/doc/libc-client__VER__/README.Debian."
+#~ msgstr ""
+#~ "O uso de senhas não criptografadas em texto puro é geralmente inseguro e "
+#~ "a versão atual da libc-client por padrão somente permite acesso a rede "
+#~ "através de conexões TLS ou SSL. Isto afeta o uw-imapd, o ipopd e "
+#~ "quaisquer outros programas que usem a libc-client para acesso a e-mail "
+#~ "através da rede. Porém, esta funcionalidade pode ser mudada usando o "
+#~ "aruivo de configuração semi-oficial /etc/c-client.cf. Leia mais sobre "
+#~ "isso em /usr/share/doc/libc-client2003debian/README.Debian."
+
+#, fuzzy
+#~ msgid ""
+#~ "Do you want to allow email access authentication using insecure plaintext "
+#~ "passwords?"
+#~ msgstr ""
+#~ "Responda sim para permitir o acesso a e-mail usando senhas em texto puro "
+#~ "inseguras."
+
+#~ msgid "Note: cramd-md5 passwords are treated as plaintext passwords!"
+#~ msgstr "Note : senhas cram-md5 são tratadas como senhas em texto puro !"
+
+#~ msgid "yes, no"
+#~ msgstr "sim, não"
+
+#~ msgid "Should plaintext passwords be enabled?"
+#~ msgstr "Senhas em texto puro devem ser habilitadas ?"
--- uw-imap-2007b~dfsg.orig/debian/TODO
+++ uw-imap-2007b~dfsg/debian/TODO
@@ -0,0 +1,18 @@
+  * Support non-self-signed certificates, and ask for optional CA
+    certificate or already prepared (or bought) certificate and private
+    key.
+  * Add hint to certificates about the creator, and check for creator in
+    postrm and remove if matching.
+  * Suggest the above to slapd, dovecot and others creating self-signed
+    certificates (or maybe create a dh_cert helper package?).
+  * Shlibs patch links unconditionally against -lk5crypto - should
+    probably do a check similar to the one in Makefile.gss.
+  * Now that $C/ARCHIVENAME is correctly read in src/imapd/Makefile and
+    src/ipopd/Makefile, check if other parts of 01_shlib.diff is no
+    longer needed.
+  * Add note in README.Debian of other packages that more documentation
+    is in libc-clientXXX.
+  * Improve backport-compatibility based on Bug#224237
+  * Check and eliminate all FIXMEs and TODOs within scripts.
+  * Replace 01_shlibs.patch with use of SPECIALS and (for static lib)
+    EXTRASPECIALS
--- uw-imap-2007b~dfsg.orig/debian/cdbs/1/rules/copyright-check.mk
+++ uw-imap-2007b~dfsg/debian/cdbs/1/rules/copyright-check.mk
@@ -0,0 +1,95 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2005-2008 Jonas Smedegaard <dr@jones.dk>
+# Description: Check for changes to copyright notices in source
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_copyright-check
+_cdbs_rules_copyright-check := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
+
+# Single regular expression for files to include or ignore
+DEB_COPYRIGHT_CHECK_REGEX = .*
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
+
+pre-build:: debian/stamp-copyright-check
+
+debian/stamp-copyright-check:
+	@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+
+# Perl in shell in make requires extra care:
+#  * Single-quoting ('...') protects against shell expansion
+#  * Double-dollar ($$) expands to plain dollar ($) in make
+	licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+		| LC_ALL=C perl -e \
+	'$$n=0; while (<>) {'\
+	'	s/[^[:print:]]//g;'\
+	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
+	'		$$files[$$n]{name}=$$1;'\
+	'		$$files[$$n]{license}=$$2;'\
+	'	};'\
+	'	if (/^\s*\[Copyright:\s*(\S.*?)\s*\]/) {'\
+	'		$$files[$$n]{copyright}=$$1;'\
+	'	};'\
+	'	/^$$/ and $$n++;'\
+	'};'\
+	'foreach $$file (@files) {'\
+	'	$$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
+	'	$$file->{license} =~ s/\s+\(v([\d\.]+)\)/-$$1/;'\
+	'	$$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
+	'	$$file->{license} =~ s/\s+\((\d+) clause\)/-$$1/;'\
+	'	$$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\
+	'	$$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\
+	'	$$pattern = "$$file->{license} [$$file->{copyright}]";'\
+	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
+	'};'\
+	'foreach $$pattern ( sort {'\
+	'			@{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\
+	'			||'\
+	'			$$a cmp $$b'\
+	'		} keys %patternfiles ) {'\
+	'	print "$$pattern: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'};'\
+		> debian/copyright_newhints
+	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
+		echo "Found $$patterncount different copyright and licensing combinations."
+	@if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
+	@newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \
+		if [ -n "$$newstrings" ]; then \
+			echo "WARNING: The following new or changed copyright notices discovered:"; \
+			echo; \
+			echo "$$newstrings"; \
+			echo; \
+			echo "To fix the situation please do the following:"; \
+			echo "  1) Investigate the above changes and update debian/copyright as needed"; \
+			echo "  2) Replace debian/copyright_hints with debian/copyright_newhints"; \
+		else \
+			echo 'No new copyright notices found - assuming no news is good news...'; \
+			rm -f debian/copyright_newhints; \
+		fi
+	touch $@
+
+clean::
+	rm -f debian/stamp-copyright-check
+
+endif
--- uw-imap-2007b~dfsg.orig/debian/cdbs/1/rules/buildinfo.mk
+++ uw-imap-2007b~dfsg/debian/cdbs/1/rules/buildinfo.mk
@@ -0,0 +1,40 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2004-2006 Jonas Smedegaard <dr@jones.dk>
+# Description: Generate and include build information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildinfo
+_cdbs_rules_buildinfo = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), dh-buildinfo
+
+common-install-arch common-install-indep:: debian/stamp-buildinfo
+
+debian/stamp-buildinfo:
+	dh_buildinfo
+	touch debian/stamp-buildinfo
+
+clean::
+	rm -f debian/stamp-buildinfo
+
+endif
--- uw-imap-2007b~dfsg.orig/debian/cdbs/1/rules/upstream-tarball.mk
+++ uw-imap-2007b~dfsg/debian/cdbs/1/rules/upstream-tarball.mk
@@ -0,0 +1,139 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2007-2008 Jonas Smedegaard <dr@jones.dk>
+# Description: Convenience rules for dealing with upstream tarballs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_upstream_tarball
+_cdbs_rules_upstream_tarball := 1
+
+include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.39)
+
+# Prefix for upstream location of all upstream tarballs (mandatory!)
+#DEB_UPSTREAM_URL = 
+
+DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
+DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION))
+DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
+# Checksum to ensure integrity of downloadeds using get-orig-source (optional)
+#DEB_UPSTREAM_TARBALL_MD5 = 
+
+DEB_UPSTREAM_WORKDIR = ../tarballs
+
+# Perl regexp to change locally used string into that in upstream URL and srcdir
+#DEB_UPSTREAM_TARBALL_VERSION_MANGLE
+cdbs_upstream_tarball_version_mangled = $(if $(strip $(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_VERSION)' | perl -pe '$(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)'),$(DEB_UPSTREAM_TARBALL_VERSION))
+
+# Base filename (without extension) as used in upstream URL
+DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+
+# Base directory within tarball
+DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+
+# Space-delimited list of directories and files to strip (optional)
+#DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
+DEB_UPSTREAM_REPACKAGE_TAG = dfsg
+DEB_UPSTREAM_REPACKAGE_DELIMITER = ~
+
+cdbs_upstream_tarball = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION)
+cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
+cdbs_upstream_repackaged_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig
+cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar
+
+# # These variables are deprecated
+_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL
+_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES
+DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES)
+
+print-version:
+	@@echo "Debian version:          $(DEB_VERSION)"
+	@@echo "Upstream version:        $(DEB_UPSTREAM_TARBALL_VERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
+
+	@if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+		if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+			rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+		fi ; \
+		echo "Downloading $(cdbs_upstream_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \
+		wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
+	else \
+		echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+	fi
+
+	@md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" | sed -e 's/ .*//'`; \
+	if [ -n "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
+		if [ "$$md5current" != "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
+			echo "Expecting upstream tarball md5sum $(DEB_UPSTREAM_TARBALL_MD5), but $$md5current found" ; \
+			echo "Upstream tarball md5sum is NOT trusted! Possible upstream tarball forge!" ; \
+			echo "Purging downloaded file. Try new download." ; \
+			rm -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+			false ; \
+		else \
+			echo "Upstream tarball is trusted!" ; \
+		fi; \
+	else \
+		echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
+	fi
+
+# TODO: Rewrite using make variables like cdbs_upstream_unpack_cmd and
+# DEB_UPSTREAM_SUPPORTED_COMPRESSIONS (recent dpkg supports bz2)
+	@untar="tar -x -C"; \
+	case "$(cdbs_upstream_local_tarball)" in \
+	    *.tar.gz)  unpack="gunzip -c";; \
+	    *.tar.bz2) unpack="bunzip2 -c";    uncompress="bunzip2";; \
+	    *.tar.Z)   unpack="uncompress -c"; uncompress="uncompress";; \
+	    *.zip)     unpack="unzip -q";      uncompress="false";       untar="-d"; nopipe="true";; \
+	    *.tar)     unpack="cat";           uncompress="true";; \
+	    *) echo "Unknown extension for upstream tarball $(cdbs_upstream_local_tarball)"; false;; \
+	esac && \
+	if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ] || [ "$$uncompress" = "false" ]; then \
+		echo "Repackaging tarball ..." && \
+		mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
+		if [ -n "$$nopipe" ]; then \
+			$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+				$$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+		else \
+			$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+				| $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+		fi && \
+		if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_repackaged_basename)" ]; then \
+			mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_repackaged_basename)"; \
+		fi && \
+		if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
+			GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_basename).tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+		else \
+			GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball).gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+		fi && \
+		echo "Cleaning up" && \
+		rm -rf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)"; \
+	elif [ -n "$$uncompress" ]; then \
+		echo "Recompressing tarball ..." && \
+		$$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)"; \
+		gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
+	fi
+
+DEB_PHONY_RULES += print-version get-orig-source
+
+endif
--- uw-imap-2007b~dfsg.orig/debian/uw-mailutils.README.debian.in
+++ uw-imap-2007b~dfsg/debian/uw-mailutils.README.debian.in
@@ -0,0 +1,8 @@
+UW IMAP C-client __VER__ support programs FOR DEBIAN
+====================================================
+
+These utilities use the c-client library for most of the actual work of
+handling mail.  So you should read the documentation in
+/usr/share/doc/libc-client__VER__/ too.
+
+Jonas Smedegaard <dr@jones.dk>  Thu, 14 Sep 2006 17:11:08 +0200
--- uw-imap-2007b~dfsg.orig/debian/control
+++ uw-imap-2007b~dfsg/debian/control
@@ -0,0 +1,119 @@
+Source: uw-imap
+Priority: optional
+Section: mail
+Maintainer: Jonas Smedegaard <dr@jones.dk>
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), dh-buildinfo, devscripts (>= 2.10.7), cdbs (>= 0.4.39), libpam-dev, libkrb5-dev, comerr-dev, libssl-dev, d-shlibs, perl, po-debconf
+Vcs-Git: git://git.debian.org/git/collab-maint/uw-imap.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/uw-imap.git;a=summary
+Homepage: http://www.washington.edu/imap/
+
+Package: uw-imapd
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openssl, libpam-runtime (>= 0.76-13.1), openbsd-inetd | inet-superserver
+Recommends: exim4 | mail-transport-agent
+Suggests: mutt | imap-client, logcheck
+Provides: imap-server
+Conflicts: imap-server
+Description: remote mail folder access server using IMAP4rev1
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains imapd, an IMAP4rev1 server daemon which uses the
+ c-client library.
+
+Package: ipopd
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openssl, libpam-runtime (>= 0.76-13.1), openbsd-inetd | inet-superserver
+Recommends: exim4 | mail-transport-agent
+Conflicts: pop3-server
+Provides: pop3-server
+Suggests: logcheck
+Description: POP2 and POP3 mail server
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains ipopd, a POP2 and POP3 server daemon which uses
+ the c-client library.
+
+Package: libc-client2007b-dev
+Section: libdevel
+Architecture: any
+Depends: libc-client2007b (= ${binary:Version}), ${devlibs:Depends}
+Conflicts: libc-client-dev
+Replaces: libc-client-dev
+Provides: libc-client-dev
+Description: c-client library for mail protocols - development files
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains the static c-client library and development
+ headers.
+
+Package: libc-client2007b
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-modules, mlock
+Suggests: uw-mailutils
+Description: c-client library for mail protocols - library files
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains the shared c-client library.
+
+Package: mlock
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: mailbox locking program
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains a program to lock mailbox files to avoid
+ corruption.
+
+Package: uw-mailutils
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: c-client support programs
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains helper tools for the libc-client library:
+  - mailutil: utility program which helps manage email mailboxes (both
+              local and IMAP/POP3/NNTP);
+  - dmail:    MDA (Mail Delivery Agent) for use with procmail;
+  - tmail:    MDA for use with the system mailer (such as Sendmail or Postfix).
--- uw-imap-2007b~dfsg.orig/debian/uw-mailutils.manpages
+++ uw-imap-2007b~dfsg/debian/uw-mailutils.manpages
@@ -0,0 +1,3 @@
+src/dmail/dmail.1
+src/mailutil/mailutil.1
+src/tmail/tmail.1
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd-ssl.README.debian
+++ uw-imap-2007b~dfsg/debian/uw-imapd-ssl.README.debian
@@ -0,0 +1,3 @@
+Now that the uw-imapd package supports SSL, this package is obsolete.  It
+is being provided solely as a way to seamlessly upgrade to uw-imapd.  
+Once uw-imapd is installed, you can purge it.
--- uw-imap-2007b~dfsg.orig/debian/README.cdbs-tweaks
+++ uw-imap-2007b~dfsg/debian/README.cdbs-tweaks
@@ -0,0 +1,111 @@
+CDBS tweak
+==========
+
+CDBS is great. In some corner cases, however, some parts of CDBS
+sometimes needs a few tweaks to work optimally.
+
+This is a collection of such tweaks. The goal is for these tweaks to be
+absorbed into upstream CDBS. We just haven't found time yet to discuss
+them at the CDBS developers' mailinglist. And possible we do not all
+agree that the tweaks are so great - therefore this "staging area".
+
+If you found this file below debian/ subdir in a source package, most
+probably only a subset of the below mentioned tweaks are relevant and
+have been shipped with the package. The repository of all these tweaks
+is here: svn://svn.debian.org/build-common/people/js/overlay/
+
+Web access: http://svn.debian.org/wsvn/build-common/people/js/overlay/
+
+
+
+New buildinfo rule
+------------------
+
+See package description for "buildinfo" for more info.
+
+
+
+Improved support for multiple compilations
+------------------------------------------
+
+Create and clean builddir _after_ resolving per-package DEB_BUILDDIR.
+
+Honour per-package DEB_BUILDDIR in makefile and autotools classes.
+
+Support multiple build flavors in makefile and autotools classes.
+
+
+
+Various improvements to python-distutils class
+----------------------------------------------
+
+Use full path to Python interpreter (Python Policy section 1.3.2).
+
+Add CDBS_BUILD_DEPENDS to old policy method.
+
+Fix CDBS_BUILD_DEPENDS in new policy methods to only depend on debhelper
+when actually used.
+
+Fix DEB_PYTHON_SIMPLE_PACKAGES sometimes installed twice (and only one
+of them honouring DEB_PYTHON_COMPILE_VERSION).
+
+Unify install path using new DEB_PYTHON_DESTDIR.
+
+Quote install path.
+
+
+
+New python-autotools class
+--------------------------
+
+Handle autotools-based Python packaging.
+
+
+
+New python-sugar class
+----------------------
+
+Handle packaging of Sugar activities.
+
+
+
+New copyright-check rule
+------------------------
+
+Refuse to build if the source is found to contain different copyright
+info than earlier builds.
+
+
+
+New kernelpatches rule
+----------------------
+
+Small wrapper around dh-kpatches, taking care of build-dependencies too.
+
+
+
+New routines for handling upstream tarball
+------------------------------------------
+
+Rules and variables to help downloading, validating and repackaging
+upstream tarball.
+
+Implements the rules print-version and get-orig-source commonly used
+for group-maintained packages with Debian-specific patches maintained in
+SVN or some other VCS, and automated fetching virgin upstream tarball
+(possibly massaged after download e.g. to strip non-DFSG material).
+
+
+
+Support for custom BTS info
+---------------------------
+
+Include BTS control info found in debian/*.bts files, or alternatively
+redirect bug reports to the email address defined in DEB_BTS_EMAIL.
+
+
+
+New dict class
+--------------
+
+Rules for packaging ispell, aspell, myspell and wordlist dictionaries.
--- uw-imap-2007b~dfsg.orig/debian/rules
+++ uw-imap-2007b~dfsg/debian/rules
@@ -0,0 +1,192 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003-2007 Jonas Smedegaard <dr@jones.dk>
+
+# This needs to run before cdbs auto-update
+debian/control:: debian/control.in
+DEB_PHONY_RULES += debian/control.in
+debian/control.in::
+	sed $(SEDRULE_CONTENT) <debian/control.in.in >debian/control.in
+
+# More info on local cdbs snippets: See debian/README.cdbs-tweaks
+include /usr/share/cdbs/1/class/langcore.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include debian/cdbs/1/rules/buildinfo.mk
+include debian/cdbs/1/rules/copyright-check.mk
+include debian/cdbs/1/rules/upstream-tarball.mk
+
+DEB_UPSTREAM_URL = ftp://ftp.cac.washington.edu/mail
+DEB_UPSTREAM_PACKAGE = imap
+DEB_UPSTREAM_TARBALL_EXTENSION = tar.Z
+DEB_UPSTREAM_TARBALL_MD5 = 4d59ce6303cf8ef93ff51341b1ce2df7
+
+DEB_UPSTREAM_REPACKAGE_EXCLUDE = docs/rfc docs/draft src/osdep/mac/mtest.sit.hqx
+
+major = $(DEB_UPSTREAM_TARBALL_VERSION)
+minor = 0
+
+SEDRULE_FILENAME = -e 's/__VER__/$(major)/g'
+SEDRULE_CONTENT = -e 's/__LIBVER__/$(major)/g' -e 's/__LIBFULLVER__/$(major).$(minor)/g' -e 's/__VER__/$(major)/g'
+
+SEDRULE_PKGCONTENT = $(SEDRULE_CONTENT) -e 's/__PKG__/$(cdbs_curpkg)/g' -e 's/__CERT__/$(CERT_$(cdbs_curpkg))/g' -e 's/__PAMSERVICE__/$(PAMSERVICE_$(cdbs_curpkg))/g' -e 's/__DESC__/$(DESC_$(cdbs_curpkg))/g' -e 's/__DAEMONSETS__/$(DAEMONSETS_$(cdbs_curpkg))/g'
+SEDPACKAGES = ipopd uw-imapd
+
+CERT_ipopd = ipop3d
+PAMSERVICE_ipopd = pop
+DESC_ipopd = University of Washington POP3 daemon
+DAEMONSETS_ipopd = pop2:ipop2d pop3:ipop3d pop3s:ipop3d
+CERT_uw-imapd = imapd
+PAMSERVICE_uw-imapd = imap
+DESC_uw-imapd = University of Washington IMAP daemon
+DAEMONSETS_uw-imapd = imap2:imapd imap3:imapd imaps:imapd
+
+CFLAGS += -D_REENTRANT -DDISABLE_POP_PROXY
+
+# Suppress seemingly non-fatal warnings to easer spot more important ones.
+CFLAGS += -Wno-parentheses -Wno-strict-aliasing
+#CFLAGS += -Wno-implicit-function-declaration
+
+# Enforce symbol resolution at build time
+# (suggested by Debian Policy 3.6.1 chapter 10.2)
+SHLIBCFLAGS = -Wl,-z,defs
+
+# Enable Kerberos V support
+EXTRAAUTHENTICATORS = gss
+
+# Upstream README is more of a README.build
+DEB_INSTALL_DOCS_ALL =
+
+pre-build::
+	echo "sed $(SEDRULE_CONTENT) <debian/control.in.in | diff -u debian/control.in -"
+	@sed $(SEDRULE_CONTENT) <debian/control.in.in | diff -u debian/control.in - || ( \
+		echo; \
+		echo "Upstream version has changed (or debian/control.in.in is out of sync)"; \
+		echo "Edit debian/control manually, or use the following command:"; \
+		echo "  DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean"; \
+		exit 1)
+
+build: debian/build-stamp
+debian/build-stamp:
+	dh_testdir
+
+	# Debian libc is believed to be IPv6-safe
+	touch ip6
+
+	$(MAKE) VERSION=$(major) EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)' EXTRACFLAGS='$(CFLAGS)' ldb
+	mv c-client/c-client.a .
+	$(MAKE) clean
+	# Use PAM
+	$(MAKE) VERSION=$(major) EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)' EXTRACFLAGS='$(CFLAGS)  $(SHLIBCFLAGS)' ldbs
+	pod2man -c "" -r "UW IMAP $(DEB_NOEPOCH_VERSION)" debian/mlock.pod debian/mlock.1
+
+	touch $@
+
+clean::
+	$(MAKE) clean
+	for dir in $(DEB_PATCHDIRS); do rm -f $$dir/*.log; done
+	rm -f c-client.a
+	rm -f debian/build-stamp
+	rm -f debian/mlock.1
+	rm -rf RCS
+	rm -f ip6
+
+# Setup (and tear down) files containing variables static per build
+pre-build::
+	for file in `find debian -maxdepth 2 -type f -name '*.in' -not -name control.in -not -name control.in.in -not -name POTFILES.in`; do \
+		targetfile=`echo $$file | sed $(SEDRULE_FILENAME) -e 's/\\.in$$//'`; \
+		sed $(SEDRULE_CONTENT) <$$file >$$targetfile; \
+	done
+
+clean:: 
+	for file in `find debian -maxdepth 2 -type f -name '*.in' -not -name control.in -not -name control.in.in -not -name README.source.in -not -name POTFILES.in -not -name 'watch.in'`; do \
+		targetfile=`echo $$file | sed $(SEDRULE_FILENAME) -e 's/\\.in$$//'`; \
+		rm -f $$targetfile; \
+	done
+
+# Setup (and tear down) files containing variables static per package
+$(patsubst %,configure/%,$(SEDPACKAGES)) ::
+	for file in `find debian -maxdepth 2 -type f -name '*._in'`; do \
+		targetfile=`echo $$file | sed $(SEDRULE_PKGFILENAME) -e 's/\\._in$$//' -e 's/__PKG__/$(cdbs_curpkg)/g'`; \
+		sed $(SEDRULE_PKGCONTENT) <$$file >$$targetfile; \
+	done
+
+$(patsubst %,binary-post-install/%,$(SEDPACKAGES)) ::
+	if [ "$(cdbs_curpkg)" != "$(PAMSERVICE_$(cdbs_curpkg))" ]; then \
+		mv debian/$(cdbs_curpkg)/etc/pam.d/$(cdbs_curpkg) debian/$(cdbs_curpkg)/etc/pam.d/$(PAMSERVICE_$(cdbs_curpkg)); \
+	fi
+
+clean::
+	for file in `find debian -maxdepth 2 -type f -name '*._in'`; do \
+		for pkg in $(SEDPACKAGES); do \
+			targetfile=`echo $$file | sed $(SEDRULE_PKGFILENAME) -e 's/\\._in$$//' -e "s/__PKG__/$$pkg/g"`; \
+			rm -f $$targetfile; \
+		done; \
+	done
+
+# Install libs and resolve dev package dependencies
+common-install-arch::
+	mkdir -p debian/tmp/usr/lib
+	install -m 0644 c-client.a debian/tmp/usr/lib/libc-client.a
+	install -m 0644 c-client/libc-client.so debian/tmp/usr/lib/libc-client.so.$(major).$(minor)
+	ln -s libc-client.so.$(major).$(minor) debian/tmp/usr/lib/libc-client.so.$(major)
+	ln -s libc-client.so.$(major).$(minor) debian/tmp/usr/lib/libc-client.so
+	mkdir -p debian/tmp/usr/include/c-client
+	install -m 0644 -t debian/tmp/usr/include/c-client \
+		src/c-client/*.h \
+		src/osdep/unix/*.h \
+		c-client/auths.c \
+		c-client/linkage.c \
+		c-client/linkage.h \
+		c-client/osdep.h
+
+common-binary-post-install-arch:: debian/install-libs-stamp
+
+debian/install-libs-stamp:
+	d-devlibdeps \
+		debian/libc-client-dev.substvars \
+		debian/tmp/usr/lib/libc-client.so
+	d-shlibmove --commit \
+		--movedev "debian/tmp/usr/include/*" usr/include \
+		debian/tmp/usr/lib/libc-client.so
+	touch $@
+
+clean::
+	rm -f debian/install-libs-stamp
+
+binary-predeb/ipopd::
+	chown root.mail debian/$(cdbs_curpkg)/usr/sbin/ipop2d
+	chown root.mail debian/$(cdbs_curpkg)/usr/sbin/ipop3d
+	chmod 2755 debian/$(cdbs_curpkg)/usr/sbin/ipop2d
+	chmod 2755 debian/$(cdbs_curpkg)/usr/sbin/ipop3d
+
+binary-predeb/uw-imapd::
+	chown root.mail debian/$(cdbs_curpkg)/usr/sbin/imapd
+	chmod 2755 debian/$(cdbs_curpkg)/usr/sbin/imapd
+
+binary-predeb/mlock::
+	chown root.mail debian/$(cdbs_curpkg)/usr/bin/mlock
+	chmod 2755 debian/$(cdbs_curpkg)/usr/bin/mlock
+
+# Make sure debconf translations are always up-todate
+clean::
+	debconf-updatepo
+
+# Refuse to ship with nonfree RFC files in source
+clean::
+	@echo "-find -name '*.txt' | grep rfc"
+	@-find -name '*.txt' | grep rfc && ( \
+		echo; \
+		echo "ERROR: RFC documents found!"; \
+		echo "RFC documents possibly do not comply with the Debian Free Software"; \
+		echo "Guidelines, and thus better be stripped from the source tarball!"; \
+		exit 1)
+
+# Needed by upstream build process
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libpam-dev, libkrb5-dev, comerr-dev, libssl-dev
+
+# Needed for our packaging routines
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), d-shlibs, perl, po-debconf
+
+# Fix double cdbs build-dependencies
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
--- uw-imap-2007b~dfsg.orig/debian/watch
+++ uw-imap-2007b~dfsg/debian/watch
@@ -0,0 +1,5 @@
+# Run the "uscan" command to check for upstream updates and more.
+version=3
+#ftp://ftp.cac.washington.edu/mail/imap-(\d\w*(\.DEV\.SNAP.*)?)\.tar\.Z 2004g
+opts=dversionmangle=s/\~dfsg$// \
+	ftp://ftp.cac.washington.edu/mail/imap-(\d\w*)\.tar\.Z debian
--- uw-imap-2007b~dfsg.orig/debian/ipopd.lintian-overrides
+++ uw-imap-2007b~dfsg/debian/ipopd.lintian-overrides
@@ -0,0 +1,2 @@
+ipopd: setgid-binary usr/sbin/ipop2d 2755 root/mail
+ipopd: setgid-binary usr/sbin/ipop3d 2755 root/mail
--- uw-imap-2007b~dfsg.orig/debian/libc-client__VER__.README.debian.in
+++ uw-imap-2007b~dfsg/debian/libc-client__VER__.README.debian.in
@@ -0,0 +1,204 @@
+UW IMAP C-CLIENT __VER__ FOR DEBIAN
+===================================
+
+
+Plaintext logins
+================
+
+By default, plaintext logins are disabled unless you are using SSL or TLS.
+This was done upstream to follow security recommendations by IETF (The Internet
+Engineering Task Force).
+
+If you absolutely must use plaintext passwords, you will need to use the
+semi-official /etc/c-client.cf
+
+The upstream author gives dire warnings about using this functionality but it
+works and is pretty stable.  See /usr/share/doc/libc-client__VER__/imaprc.txt.gz
+for further information.  You specifically want to:
+ 
+    set disable-plaintext nil
+
+
+CRAM-MD5 SASL authentication
+============================
+
+To enable it you need to have a file called /etc/cram-md5.pwd See 
+/usr/share/doc/libc-client__VER__/md5.txt for information on how to set this up.  
+
+An ancient version of this package installed an empty /etc/cram-md5.pwd.  
+Although this ill-advised move was fixed quickly, because it was marked as
+a conffile, you may still have it around.  As a result, your users may
+not be able to login.  The fix is to either delete this file or populate it
+with passwords as explained in /usr/share/doc/libc-client__VER__/md5.txt .
+
+Beware that even though CRAM-MD5 stores passwords encrypted, it is treated
+as plaintext, so the above restrictrictions about "Plaintext logins" apply.
+
+
+Setting up SSL/TLS with popular mail clients.
+=============================================
+
+These are not comprehensive instructions but hopefully will help you enable
+encryption support with some of the popular software out there.
+
+General Comments
+----------------
+
+By default, the imapd and ipopd packages create a self-signed certificate for 
+you.  Many programs will complain about this.  Usually there is some option 
+to turn off the warning or you can get a real certificate from verisign etc.
+
+The default port for imap over SSL is 993 and 995 for POP3 over SSL.
+
+
+Eudora
+------
+
+To specify an SSL connection:
+
+  * Start Eudora and use the Tools/Options menu option then choose the Checking 
+    Mail section. Ensure that the "Secure Sockets when Receiving" option is set 
+    to "Required, Alternate Port." Eudora Checking Mail dialog 
+
+(Thanks Ray Miller)
+
+KMail
+-----
+
+  * Click Settings->Configure KMail
+  * Click Network Icon
+  * Click 'Receiving' tab
+  * Click 'Add' button
+  * Select 'IMAP' for 'Account Type'
+  * Fill out form
+  * Click 'Security' tab
+  * Click 'Check what the server supports' button
+  * Click 'OK' (on 'Modify Account' window)
+  * Click 'OK' (on 'Configure' window)
+
+(Thanks Ian Eure)
+
+Mozilla Mail & News
+-------------------
+
+To specify an SSL connection:
+
+ * Start Mozilla Mail & News and use the Edit/Mail & Newsgroups Account Settings
+    menu option then choose the Mail & Newsgroups - Server Settings section. 
+ * Make sure that the "Use Secure Connection (SSL)" box is checked and the 
+   proper port is specified.
+
+Mutt
+----
+
+SSL with mutt is well documented in /usr/share/doc/mutt/README.SSL.gz
+
+(Thanks Neil Spring)
+
+Netscape Messenger
+------------------
+
+To specify an SSL connection:
+
+  * Start Netscape Messenger and use the Edit/Preferences menu option then 
+    choose the Mail & Newsgroups - Mail Servers section. 
+  * Select the email account for which you want to specify an SSL connection 
+    and click on the Edit button.
+  * On the IMAP tab, make sure that the "Use Secure Connection (SSL)" box is 
+    ticked.
+
+(Thanks Ray Miller)
+
+Outlook Express
+---------------
+
+To specify an SSL connection:
+
+  * Start Outlook Express and use the Tools/Accounts menu option.
+  * Select the email account for which you want to specify an SSL
+    connection and click on the Properties button.
+  * On the Advanced tab, make sure that the "This server requires a secure
+    connection" box is ticked.
+
+(Thanks Ray Miller)
+
+Pine
+----
+
+  * Add /tls/novalidate-cert  to folder names in .pinerc for TLS.
+  * Add /notls/ssl/novalidate-cert to folder names in .pinerc for SSL.
+
+If you would like to make any corrections or additions, please let me know.
+
+
+Default mailbox location
+========================
+
+As of version 4.5-8, the mailbox root is back to being $HOME.  I apologize
+for the inconvenience I have caused, but however I keep it, it is going to
+annoy someone or the other.  $HOME is better because:
+
+  a) most of the bug reports complain about it.
+  b) That's what the upstream distribution does.  So it's less of a
+     maintenance headache for me.
+  c) It's what most people expect (Principle of least surprise.)
+  d) The reasoning behind the previous change was bogus anyway.
+
+Please be sure to check your setup to see if there is anything that might
+be affected by this change.  (Procmail rules are onething that immediately
+comes to mind.
+
+One problem with $HOME being the mailbox root is every file in that
+directory will show up as a folder by default.  To reduce clutter select
+your imap clients "Show only subscribed folders" option.  (Most clients
+have one.)  Most also have an option to set "server path" or something
+similar.  You can set this to $HOME/mail or another directory of your
+choosing if you want to keep all your folders together in one place.
+ 
+If you really, really want to make the IMAP server set the mailbox root to
+$HOME/mail or any other place for that matter, see the topic above on
+plaintext passwords for how to tweak settings locally by the use of
+/etc/c-client.cf. You will need something like this:
+
+    set mail-subdirectory mail
+
+Alternatively you can see the toplevel Makefile in the source, set
+MAILSUBDIR to your choice and recompile. 
+
+
+mbox driver
+===========
+
+This package has the mbox driver enabled which means that if there is a
+file in your $HOME directory called mbox it will be treated as your inbox
+and all mail in your system inbox (/var/mail/<your login>) will
+immediately be transfered there on access.
+
+[Thanks to Brock Rozen for help with the above comments]
+
+
+RestrictedBox option enabled
+============================
+
+Since july 2003 c-client has been compiled with the option "restrictedBox"
+enabled, so that paths starting with ".." or "/" are disallowed.
+
+In most situations this should cause no problems, but in case you suspect
+to need the default behaviour (which can be considered a security issue,
+since it allows access to /etc/passwd) try adding the following to
+/etc/c-client.cf (and read other remarks about that file earlier in this
+document):
+
+    set restrictedBox NIL
+
+
+Enhanced maildir support
+========================
+
+This package has been patched to Support maildir format mailboxes.  See 
+/usr/share/doc/libc-client__VER__/README.maildir.gz for further info.
+
+
+
+Jaldhar H. Vyas <jaldhar@debian.org>, Sun, 20 Oct 2002 11:23:00 -0400
+Updates: Jonas Smedegaard <dr@jones.dk>  Sat, 15 Mar 2003 21:10:00 +0100
--- uw-imap-2007b~dfsg.orig/debian/mlock.manpages
+++ uw-imap-2007b~dfsg/debian/mlock.manpages
@@ -0,0 +1 @@
+debian/mlock.1
--- uw-imap-2007b~dfsg.orig/debian/mlock.pod
+++ uw-imap-2007b~dfsg/debian/mlock.pod
@@ -0,0 +1,26 @@
+=head1 NAME 
+
+mlock -- lock a mailbox
+
+=head1 SYNOPSIS
+
+/usr/bin/mlock
+
+=head1 DESCRIPTION
+
+If B<libc-client.so> is unable to create a mailbox lock file, it will call
+this program.  This makes using the mailbox safe over i.e. NFS. There is
+no reason to call B<mlock> yourself or through another program.  It is
+setgid mail so there is no need to change the permissions of
+I</var/mail> to 1777.
+
+=head1 BUGS
+
+No documentation other than this crappy man page,
+
+=head1 AUTHOR
+
+mlock was written by Mark Crispin <mrc@cac.washington.edu>
+This man page was written for Debian GNU/Linux by Jaldhar H. Vyas
+<jaldhar@debian.org>
+
--- uw-imap-2007b~dfsg.orig/debian/README.source
+++ uw-imap-2007b~dfsg/debian/README.source
@@ -0,0 +1,14 @@
+NB! This file is a draft - it does not yet comply to Debian Policy 3.8!
+
+Upstream *.tar.Z archive has been uncompressed and compressed using GNU
+Gzip to meet Debian packaging requirements.
+
+Upstream source has been repackaged to not include the following files:
+	docs/rfc (not DFSG-free)
+	docs/draft (not DFSG-free)
+	src/osdep/mac/mtest.sit.hqx (binary code)
+
+Included is a patch to support Maildir-style storage, originally written
+by Eduardo Chappa <chappa@math.washington.edu> and published at
+http://staff.washington.edu/chappa/pine/ (read
+/usr/share/doc/libc-client2007b/README.Maildir.gz for more info).
--- uw-imap-2007b~dfsg.orig/debian/changelog
+++ uw-imap-2007b~dfsg/debian/changelog
@@ -0,0 +1,1312 @@
+uw-imap (7:2007b~dfsg-4+lenny3~bpo40+1) etch-backports; urgency=low
+
+  * Etch backport.
+  * Lower debhelper compat level to avoid using the backported DH7, which
+    conflicts with Etch quilt.
+  * Strip src/osdep/mac/mtest.sit.hqx, which was removed from the upstream
+    tarball, from the Debian diff.
+
+ -- Magnus Holmgren <holmgren@debian.org>  Wed, 14 Jan 2009 21:40:29 +0100
+
+uw-imap (7:2007b~dfsg-4+lenny3) testing-security; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Fix stack-based buffer overflow in tmail/dmail that could allow
+    local users to execute arbitrary code
+    (0001_insecure_strcmp.patch; CVE-2008-5005)
+  * Fix NULL ptr dereference because of a malicious response to the QUIT
+    command leading to denial of service
+    (0002_no_close_quit_netstream.patch; CVE-2008-5006)
+  * Fix denial of service vulnerability because of rfc822_output_char() not
+    checking for a full buffer and writing one byte ahead the buffer, later
+    resulting in memcpy getting called with a possible size argument of -1
+    (0003_CVE-2008-5514.patch; CVE-2008-5514)
+
+ -- Nico Golde <nion@debian.org>  Wed, 24 Dec 2008 12:03:39 +0100
+
+uw-imap (7:2007b~dfsg-3) unstable; urgency=high
+
+  * Fix patch 1001 to properly include IP6 flag, so package get compiled
+    with IPv6 support as intended.  Closes: bug#268251, thanks to
+    Herbert Meier and others for reporting and to Christophe Wolfhugel
+    for spotting the cause of the problem and providing a patch.
+  * Setting urgency=high as this is a regression to earlier releases,
+    and the fix is quite small.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 22 Aug 2008 09:57:49 +0200
+
+uw-imap (7:2007b~dfsg-2) unstable; urgency=medium
+
+  * Packaging moved to collab-maint Git at Alioth. Update VCS-* hints.
+  * Update Danish (da) locale.
+  * Update Brazilian Portuguese (pt_BR). Closes: #469320, thanks to Eder
+    L. Marques.
+  * Let debhelper install logcheck rules.
+  * Fix logcheck rules to ignore connections from resolved domains (not
+    only IP numbers).  Closes: bug#298706, #427498, thanks to Donovan
+    Baarda and Justin Pryzby.
+  * Thanks to Christian Perrier for help pushing this release!
+  * Set urgency=medium to hopefully reach Lenny before frozen.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 12 Jul 2008 17:51:37 +0200
+
+uw-imap (7:2007b~dfsg-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Unfuzz patches.
+  * Update semi-auto-update warning in debian/rules to advertise
+    DEB_AUTO_UPDATE_DEBIAN_CONTROL.
+  * Update cdbs dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
+  * Release for experimental as instructed by Release team at the end of
+    http://lists.debian.org/debian-devel-announce/2008/06/msg00000.html
+  * Add new file README.source (only draft for now - need more work to
+    comply with Debian Policy 3.8).
+  * Rewrite debian/copyright:
+    + Use recent draft of machine-readable format proposed at
+      http://wiki.debian.org/Proposals/CopyrightFormat
+    + Refer to Apache 2.0 license at common location, thanks to lintian
+    + License debian packaging as GPL-2+
+    + Move details on repackaging and Maildir patch to README.source.
+  * Strip Macintosh binary from source (in addition to RFC documents).
+    Document stripped files in README.source.
+  * Rely on debhelper to install lintian overrides (without tightening
+    build-dependency: overrides are just gracefully ignored if too old
+    debhelper is used), thanks to lintian.
+  * Drop deprecated linda overrides, thanks to lintian.
+  * Fix referring to /usr/share/doc (not /usr/doc) in a README, thanks
+    to lintian.
+  * Update local cdbs snippets:
+    + Major improvements to copyright-check, most importantly avoiding a
+      FTBFS by only warning about changes to copyright-hints by default.
+      Update debian/copyright_hints.
+    + Various improvements to upstream-tarball.mk, including renaming
+      top srcdir in repackaged tarball to $pkg-$ver.orig to comply with
+      Developers Reference 6.7.8.2.  Simplify use in debian/rules.
+    + Update debian/README.cdbs-tweaks.
+  * Bump debhelper compatibility to level 6 (was 4).
+  * Semi-auto-update debian/control to apply above cdbs-related changes:
+    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+    This also bumps names of binary library packages (historic artifact
+    to cope with restrictive license that has since been improved, but
+    too much in the packaging routines is tied to that naming scheme to
+    change this close to release of Lenny), and updates README.Debian
+    (and more) which closes: bug#461386, thanks to Tomas Pospisek.
+  * Set urgency=medium as this should hopefully reach Lenny, due to new
+    release containing only bugfixes, and the cdbs fixes to avoid FTBFS.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 03 Jul 2008 10:43:57 +0200
+
+uw-imap (7:2007~dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Adjust patches 1001 and 2004 to no longer change hardcoded location
+    of LOCKPGM (mlock): Upstream now by default look for the helper app
+    at the following locations:
+    1) /etc/mlock (the old default, violating Linux FHS)
+    2) /usr/libexec/mlock
+    3) /usr/bin/mlock (our earlier hardcoded path)
+  * Update patch 1003 (or more correctly: Replace with similar patch
+    written for alpine instead of pine). Drop now unneeded patch 1011.
+  * Unfuzz patches 1001, 1003 and 2002.
+  * Update cdbs tweaks:
+    + update-tarball improved repackaging
+    + Drop local tweak bts.mk (all bugreports are welcome at Debian BTS)
+    + Drop local tweak buildcore.mk (superfluous)
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #446204
+  * Debconf translation updates
+    + Japanese. Closes: #446574
+    + Swedish. Closes: #446761
+    + Galician. Closes: #446789
+    + French. Closes: #446849
+    + Turkish. Closes: #446880
+    + Vietnamese. Closes: #446903
+    + Portuguese. Closes: #444469, #446942
+    + Finnish. Closes: #447070
+    + Basque. Closes: #447230
+    + Czech. Closes: #447435
+    + Spanish; Castilian. Closes: #447711
+    + Italian. Closes: #448236
+    + Russian. Closes: #448322
+    + German. Closes: #448383
+  * Semi-auto-update debian/control to fix version-specific package
+    names:
+    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 26 Dec 2007 20:44:42 +0100
+
+uw-imap (7:2006k~dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+    + Unfuzz patches.
+  * Add Vcs-Svn and Vcs-Browser fields to debian/control.
+  * Update cdbs tweaks:
+    + update-tarball needs cdbs 0.4.39 or newer (only relevant for
+      backports).
+  * Update build-dependency cosmetics in debian/rules, and semi-auto-
+    update debian/control:
+      DEB_BUILD_OPTIONS=cdbs-autoupdate fakeroot debian/rules pre-build
+  * Move Homepage to own field (from pseudo-field in long description).
+  * Switch from .dfsg to ~dfsg to make room for point releases.
+  * Bump to standards-version 3.7.3 (no changes needed).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 10 Dec 2007 16:41:46 +0100
+
+uw-imap (7:2006j2.dfsg-3) unstable; urgency=low
+
+  * Release for unstable.
+  * Describe Maildir support as EXPERIMENTAL in NEWS.Debian.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 22 Aug 2007 17:32:35 +0200
+
+uw-imap (7:2006j2.dfsg-2) experimental; urgency=low
+
+  * Acknowledge NMUs (applied while 2006x was in experimental or
+    incoming (editing history is forbidden by policy: See changelog
+    entries of those NMUs in BTS):
+    + 7:2002edebian1-13.1: Add dutch (nl), german (de), galician (gl)
+      and portuguese (pt) l10n. Closes: #364466, #398609, #407895,
+      #409409, thanks to Christian Perrier.
+    + 7:2002edebian1-13.2: Gracefully handle update-inetd missing in
+      postrm scripts. Closes: #417138, #416780, thanks to Steve
+      Langasek.
+    + 7:2002edebian1-13.3: Gracefully handle debconf missing in postrm
+      scripts. Closes: #431527, 431525, thanks to Mario Iseli.
+  * Update cdbs tweaks:
+    + Preserve upstream name for original source if repackaging.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 08 Aug 2007 12:41:57 +0200
+
+uw-imap (7:2006j2.dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update local cdbs tweaks:
+    + Improved upstream.tarball.mk to support the odd version number.
+  * Unfuzz patches.
+  * Update references to Maildir patch.
+  * Fix __VER__ expansion of debian/copyright.
+  * Declare (and cleanup) build-dependencies in debian/rules.
+  * Use binNMU-safe ${binary:Version} (not ${Source-Version}) in
+    debian/control.
+  * Have packages ipopd and uw-imapd depend on openbsd-inetd or
+    inet-superserver (not netbase).
+  * Add russian (ru) locale. Closes: bug#433107, thanks to Yuri Kozlov.
+  * Update brazilian portuguese (pt_BR) locale. Closes: bug#421521,
+    thanks to André Luís Lopes.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 30 Jul 2007 11:50:02 +0200
+
+uw-imap (7:2006g.dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * Fix SONAME versioning, and install using d-shlibmove.
+  * Build-depend on po-debconf.
+  * Update turkish (tr) debocnf l10n. Closes: bug#417552.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 08 Apr 2007 12:34:33 +0200
+
+uw-imap (7:2006f.dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * Repackage source to not include RFCs (as was also done with 2006b
+    and 2006d too). Closes: bug#393417.
+  * Unfuzz patches.
+  * Update local cdbs tweaks:
+    + Add new local cdbs tweak upstream.tarball.mk to add a
+      get-orig-source target and more.
+    + Actually load standard buildcore when overloading buildcore.
+    + Emit list of suspects if new copyrights are found.
+    + Check for copyrights at pre-build (at clean we might run before
+      actual cleanup has finished).
+    + Suppress BTS report redirection for official Debian suites.
+    + Update README.cdbs-tweaks.
+  * Update debian/copyright to include the year 2007 in main copyright,
+    thanks to copyright-check.mk.
+  * Semi-auto-update debian/control
+    + This updates library package names in debian/control, and thus
+      closes: bug#414290, thanks to Magnus Holmgren.
+  * Add rule to fail if building with out-of-sync library version names,
+    to avoid the above from reoccuring.
+  * Improve debconf templates, thanks to lintian.
+  * Depend on ${misc:Depends} (not bogus ${debhelper-depends}), thanks
+    to lintian.
+  * Fix SONAME (stripping repackaging hint from library version name
+    broke it).
+  * Rewrite debconf templates to better explain the risk of port choices
+    getting ignored. Closes: bug#302577, #302579, #303612.
+  * Invoke debconf-updatepo in clean target to ensure debconf
+    translations are always up-to-date. Thanks to lintian.
+  * Unfuzz danish localization.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 20 Mar 2007 09:49:42 +0100
+
+uw-imap (7:2006d.dfsg-1) experimental; urgency=low
+
+  * Mew upstream release.
+  * Maildir patch updated to November 18, 2006 release.
+  * Unfuzz other patches.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 19 Dec 2006 22:03:51 +0100
+
+uw-imap (7:2006b.dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * Make IPv6 brokenness build-time warning non-interactive.
+  * Patch Maildir patch to use CHUNKSIZE (instead of no longer available
+    MAXMESSAGESIZE).
+  * Improved patch handling:
+    + Use quilt patchsystem (instead of internal cdbs simple-patchsys).
+    + Renumber patches to indicate their scope.
+    + Add debian/patches/README documenting new numbering scheme.
+  * Fix manpage symlinks for ipopd.
+  * Drop support for backporting to non-Unicode l10n:
+    + No longer use custom po-debconf (and tweaked debhelper) cdbs rule.
+    + Simplify l10n templates (drop the use of *.template.master files).
+    + No longer mention the special handling in README.build.
+    + Run debconf-updatepo.
+  * No longer mention licensing-mandated version tweak in README.build.
+  * Beautify shlib version (strip trailing ".dfsg" from string).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon,  9 Oct 2006 20:40:44 +0200
+
+uw-imap (7:2006a.dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * Upstream source relicensed to use the Apache 2.0 license:
+    + Simplify packaging to no longer tweak version number of binaries.
+    + Update debian/copyright and debian/copyright_hints.
+  * Strip RFCs (as usual) and append .dfsg to version number of source
+    package (instead of the now dropped .debianN).
+  * Use version resolving provided by cdbs (instead of homemade rules),
+    and define revision within debian/rules (not in upstream version).
+  * Improve watch file to use dversionmangle (and no hardcoded version).
+  * Maildir patch updated to March 12, 2006 release (the one included
+    with the below 7:2004g.debian1-1 was the August 03, 2005 release).
+  * Unfuzz remeaining patches.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue,  3 Oct 2006 17:21:59 +0200
+
+uw-imap (7:2004g.debian1-1) experimental; urgency=low
+
+  * New upstream release. Closes: Bug#254238 (thanks to Peter
+    Marschall, and to Tzafrir Cohen for spiritual support making it
+    finally compile correctly).
+  * Strip DFSG-nonfree RFCs and RFC drafts from source.
+  * Drop patches applied upstream:
+    + 03_avoid_hardcoded_optimization
+    + 05_CAN-2005-0198
+    + 06_CAN-2005-2933
+    + 11_manpages_are_not_local
+    + 12_mailutil_manpage_typo
+  * Drop part of patch 04_no_binaries_below_etc (that should have been a
+    separate patch) about md5 and apop, applied upstream.
+  * Remove no longer used md5 code from (Debian patches to) source.
+  * Merge patches 01_shlib and 02_mailutils_use_shlib into 01_shlib.
+  * Separate part of patch 01_shlib about MAILSPOOL into new patch
+    02_mailspool.
+  * Unfuzz remaining 2 patches and compact them (speeds patching a bit).
+  * Enable IPv6 support. Closes: bug#299818.
+  * Improve logcheck rules. Closes: Bug#244324 (thanks to Paul Traina).
+  * Improve Debian version handling:
+    + Change version number scheme to ${upstream}.debian${debianver}
+      (separate upstream and "debian" with a dot) to properly handle
+      alphanumerics in upstream version ( 2004debian1 !> 2004ddebian ).
+    + Parse more cleverly: Reuse simply expanded variables.
+    + Handle UPSTREAMVER and use it to automatically update watch file.
+  * Several updates to debian/TODO.Debian.
+  * Patch _after_ checking for up-to-date debian/rules, not before.
+  * Update cdbs snippets related to po-debconf. Closes: bug#332136
+    (thanks to Joey Hess).
+  * Add new local cdbs snippet copyright-check.
+  * Update remaining cdbs files, and add debian/README.cdbs-tweaks
+    documenting their purpose.
+  * Add myself as author of debian/rules (nothing is left from debmake).
+  * Raise priority again for libc-client-dev from extra to optional, to
+    match current overrides.
+  * Add new promising Maildir patch. Closes: bug#273678, #230343,
+    #312401 (thanks to Tomas Pospisek).
+  * Now that Maildir support is added back the high priority debconf
+    warning is no longer relevant. Closes: bug#268192 (thanks to
+    Christian Perrier).
+  * Cleaned up debian/copyright:
+    + Update copyright and licensing info:
+      - Year 2004 included.
+      - Clarified distribution with proprietary systems.
+      - Include notes about Maildir patch.
+    + Replace info contained in changelog with note on "GNU systems".
+    + Declare each topic more strictly.
+    + Mention "licensing info" together with copyright.
+    + Add (historical) copyright info of Stanford University.
+  * Silence some tests in debian/rules.
+  * Bump standards-version to 3.7.2 (no changes needed).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 17 Sep 2006 05:46:42 +0200
+
+uw-imap (7:2002edebian1-14) unstable; urgency=low
+
+  * Cleanup dependencies in debian/control:
+    + Drop conflicts for packages older than oldstable.
+    + Use versioned dev package with conflicts/replaces/provides for
+      virtual unversioned package.
+    + Stop providing policy-violating virtual package pop2-server.
+  * Cleanup debian/rules:
+    + Drop no longer used update-control from DEB_PHONY_RULES.
+    + Use -L option in DEB_DH_SHLIBDEPS_ARGS (drops support for woody).
+    + Always update debian/control.in (only debian/control is holy).
+  * Cleanup debian/*.README.Debian:
+    + Update (currently unused) maildir notes.
+    + Correct typo: s/ipod/ipopd/.
+  * Rewrite long descriptions, based on texts from upstream homepage:
+    + Advertise the c-client library in uw-imapd and ipopd packages.
+    + Drop advertising smtp servers.
+    + Warn about lack of Maildir support.
+    + Warn about disabling encryption at the library.
+    + Add homepage URL.
+  * Drop no longer needed transition packages.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 20 Apr 2006 11:59:30 +0200
+
+uw-imap (7:2002edebian1-13) unstable; urgency=low
+
+  * Apply patch fixing IPv6 for ipopd. Closes: bug#348369 (thanks to
+    Sjoerd Simons <sjoerd@debian.org>).
+  * Improve local cdbs snippets:
+    + Fix namespaces.
+    + Use newer local debhelper snippet again, this time appending to
+      dh_gencontrol rather than override it. Adjust po-debconf.
+    + Add and enable new auto-update snippet. Move debian/control.in to
+      debian/control.in.in.
+  * Correct copyright info for debian/rules (debmake skeleton is long
+    gone).
+  * Fix order of parameters/options to find in debian/rules.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 16 Jan 2006 18:29:51 +0100
+
+uw-imap (7:2002edebian1-12) unstable; urgency=high
+
+  * Patch src/c-client/mail.c against remote exploitable buffer overflow
+    allowing attacker to execute arbitrary code - CAN-2005-2933. This
+    closes: bug#332215 (thanks to iDEFENCE and Martin Pitt
+    <martin.pitt@canonical.com>).
+  * Add/update debconf l10n:
+    + Catalan (ca). Closes: Bug#248762 (thanks to Debian L10n Catalan
+      Team).
+    + Czech (cs). Closes: bug#313261 (thanks to Miroslav Kure
+      <kurem@upcase.inf.upol.cz>).
+    + French (fr). Closes: Bug#241986 (thanks to debian-l10n-french
+      mailing list contributors).
+    + Japanese (ja) Closes: Bug#241804 (thanks to Kenshi Muto
+      <kmuto@debian.org>).
+    + Spanish (es). Closes: bug#323375 (thanks to Carlos Galisteo de
+      Cabo <cgalisteo@k-rolus.net>),
+    + Swedish (sv). Closes: bug#333346 (thanks to Daniel Nylander
+      <yeager@lidkoping.net>).
+    + Turkish (tr). Closes: Bug#249129 (thanks to Mehmet Turker).
+    + Vietnamese (vi). Closes: bug#324073 (thanks to Vietnamese free-
+      software translation team / nhóm Việt hóa phần mềm tự
+      do).
+  * Modernize maintainer scripts (thanks to lintian):
+    + Use `chown uid:gid` (not `chown uid.gid`).
+    + Use [ test1 ] && [ test2 ] (not [ test1 -a test2 ]).
+  * Source debconf in libc-clientXXX postinst even if unused (thanks to
+    lintian).
+  * Claim compliance with Policy 3.6.2 (no changes needed).
+  * Set urgency=high due to security fix.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 11 Oct 2005 16:24:14 +0200
+
+uw-imap (7:2002edebian1-11) unstable; urgency=high
+
+  * Update l12n:
+    + Japanese (ja). Closes: bug#306940 (thanks to Kenshi Muto
+      <kmuto@debian.org>).
+    + French (fr). Closes: bug#303982 (thanks to Christian Perrier
+      <bubulle@debian.org>).
+    + Danish (da). Closes: bug#303443 (thanks to Morten Brix Pedersen
+      <morten@wtf.dk>).
+  * Setting urgency=high as this contains only l12n updates and is
+    wanted for sarge.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 16 May 2005 02:43:11 +0200
+
+uw-imap (7:2002edebian1-10) unstable; urgency=high
+
+  * Have uw-imapd and ipopd depend on netbase (I thought that package
+    was required but it is "just" important). Closes (but only when this
+    has entered sarge): bug#308401 (thanks to Frank Lichtenfeld
+    <djpig@debian.org>).
+  * Set urgency high as this is policy violating and should go into
+    sarge if at all possible.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 11 May 2005 09:14:52 +0200
+
+uw-imap (7:2002edebian1-9) unstable; urgency=high
+
+  * Remove cache file before filling it for idempotency (in particular
+    to avoid reuse of imap entries in the ipop cache file generated at
+    failed attempts to install broken 7:2002edebian1-6.1).
+  * Fix postinst of daemon packages to only append binary when adding to
+    inetd, not when enabling (the space in front of the binary is what
+    you've all seen as "The service name may not include a whitespace
+    character!"). This closes: bug#301727, 301926, 302302 (thanks to
+    Paul Traina <reportbug@st04.pst.org>, Michael R Head
+    <burner@suppressingfire.org> and especially to Wen-chien Jesse Sung
+    <jesse@cola.voip.idv.tw> for insisting in something being wrong).
+  * ...and now that the code actually works, it reveals that debconf
+    choices are ignored except at initial install. So add another
+    debconf question on enforcing debconf choices or not.
+  * Handle disabling ports through debconf (if enforced). If unenforced,
+    emit a warning (this is getting pretty ugly).
+  * Setting urgency=high to (hopefully) straighten out the last mess of
+    bug#295306.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 31 Mar 2005 11:07:24 +0200
+
+uw-imap (7:2002edebian1-8.0.jones.2) unstable; urgency=low
+
+  * Change per-package names from "_*.in" to "*._in" to simplify regex.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 29 Mar 2005 22:51:16 +0200
+
+uw-imap (7:2002edebian1-8.0.jones.1) unstable; urgency=low
+
+  * Lower priority only for libc-client-dev. Revert default to optional.
+  * Unite debconf daemon handling in single files in source, to avoid
+    future NMU bugs like the one created in -6.1 (mistaking the daemon).
+  * When packaging, avoid too deep searches for files to sed.
+  * Add README.build to source documenting special filenames.
+  * Use cdbs for basic CFLAGS setup.
+  * Avoid installing upstream README (it is more a README.build).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 28 Mar 2005 12:40:22 +0200
+
+uw-imap (7:2002edebian1-8) unstable; urgency=high
+
+  * Oddly enough, last upload disappeared while processed. Bumping up
+    version number instead of risking more trouble and delay. This still
+    closes: bug#295306, #301213.
+  * Changing priority to extra to follow libkrb5-dev and comerr-dev.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 28 Mar 2005 03:20:41 +0200
+
+uw-imap (7:2002edebian1-7) unstable; urgency=high
+
+  * Acknowledge NMU. Closes: bug#295306 (thanks to Steve Langasek
+    <vorlon@debian.org> and others helping out).
+  * Fix patch in NMU to not fail in preinst if grep provides no result.
+    Closes: bug#301213 (thanks to Adam Sjøgren <asjo@koldfront.dk> and
+    Rene Konasz <oe4@gmx.at> for reporting, and Darren Salt
+    <linux@youmustbejoking.demon.co.uk> and Steve Langasek
+    <vorlon@debian.org> for help fixing).
+  * Fix grep'ing for imap in prerm of ipopd.
+    WARNING: If you've managed
+  * Adjust indenting of NMU patch to coding style of remianing scripts.
+  * Set urgency=high for same reason as the NMU.
+  * Respect the word "reasonable" in Debian Policy about enabling
+    warnings: Suppress excessive but seemingly non-fatal warnings to
+    easer spot more important ones.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 27 Mar 2005 01:02:28 +0100
+
+uw-imap (7:2002edebian1-6.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for sarge-targetted RC bugfix
+  * Handle inetd.conf correctly on upgrades, to not lose local
+    configuration changes; thanks to Pierre Habouzit
+    <pierre.habouzit@m4x.org> and Adeodato Simó <asp16@alu.ua.es> for
+    their work on this fix (closes: #295306).
+
+ -- Steve Langasek <vorlon@debian.org>  Mon, 21 Mar 2005 04:59:48 -0800
+
+uw-imap (7:2002edebian1-6) unstable; urgency=high
+
+  * Fix CERT security bug VU#702777: CRAM-MD5 authentication (disabled
+    by default in Debian) would always grant access after 4 failed
+    attempts. This closes: bug#292606, #293418 (thanks to Tomas Pospisek
+    <tpo_deb@sourcepole.ch> for first reporting it and Martin Schulze
+    <joey@infodrom.org> for providing a patch).
+  * Set urgency=high due to above security fix.
+  * Update local cdbs snippets:
+    + buildinfo.mk: Make it actually work (tie to proper targets).
+    + debhelper.mk: Add CDBS_BUILD_DEPENDS.
+    + bts.mk: Make a test more quiet.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu,  3 Feb 2005 20:22:23 +0100
+
+uw-imap (7:2002edebian1-5) unstable; urgency=low
+
+  * Stop messing with with /etc/c-client.cf using debconf (giving up -
+    cannot figure out a solid set of routines). Closes: bug#273687,
+    #239537 (thanks to all reporting the issue over time).
+  * Depend on (not only recommend) debconf and remove fallback for
+    libc-client, to obey Debian Policy 3.10.1.
+  * Improve logcheck rules (wonder why I didn't need this myself).
+    Closes: bug#271569, #277696 (thanks to Will Deutsch
+    <wdeutsch@pqbon.com> and Wouter de Vries
+    <w.l.devries@student.tudelft.nl>).
+  * Correct typo in mailutil manpage. Closes: bug#251910 (thanks to
+    Markus Järvinen <mkj@iki.fi>).
+  * Refer to current location of library in NEWS (not the location at
+    the time of breaking the news). Closes: bug#276460 (thanks to Calum
+    Mackay <calum.mackay@cdmnet.org>).
+  * Correct french (fr) l12n typo, and make protocol names
+    untranslatable. Closes: bug#277055 (thanks to Alexandre Fayolle
+    <alexandre.fayolle@logilab.fr> and Christian Perrier
+    <bubulle@debian.org>).
+  * Add Czech (cs) l12n. Closes: bug#287306 (thanks to Miroslav Kure
+    <kurem@upcase.inf.upol.cz>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon,  3 Jan 2005 14:39:10 +0100
+
+uw-imap (7:2002edebian1-4) unstable; urgency=high
+
+  * Add/update debconf l12n, superseding non-maintainer upload. Closes:
+    bug#275226 (thanks to Denis Barbier <barbier@debian.org>).
+    + Japanese (ja) updated. Closes: bug#241804 (thanks to Kenshi Muto
+      <kmuto@debian.org>).
+    + French (fr) added. Closes: bug#241986 (thanks to Christian Perrier
+      <bubulle@debian.org>).
+    + Catalan (ca) updated. Closes: Bug#248762 (thanks to Aleix Badia i
+      Bosch <a.badia@callusdigital.org>).
+    + Turkish (tr) added. Closes: bug#249129 (thanks to Recai Oktas
+      <roktas@omu.edu.tr> and Mehmet Turker).
+    + Brazilian Portuguese (pt_BR) added (or updated, actually: It seems
+      to have fallen out at some point - sorry about that!). Closes:
+      bug#267322 (thanks to Andre Luis Lopes <andrelop@debian.org>).
+    + German (de) added. Closes: bug#267674 (thanks to Erik Schanze
+      <schanzi_usenet@gmx.de>).
+    + Danish (da) updated. Closes: bug#275980 (thanks to Morten Brix
+      Pedersen <morten@wtf.dk>).
+    + Spanish (es) added. Closes: bug#276285 (thanks to Carlos Galisteo
+      <cgalisteo@k-rolus.net>).
+  * Begin using cdbs:
+    + Build-depend on cdbs.
+    + Include localbuildinfo.mk snippet and build on dh-buildinfo.
+    + Use simple-patchsys.mk and drop local cbs make snippet.
+    + Use debhelper.mk and simplify debian/rules greatly.
+    + Include a few additional cdbs snippets helpful for backporting.
+    + Avoid using makefile.mk this close to sarge release!
+  * Add debian/NEWS with notes on secure-only connections and dropped
+    Maildir-support.
+  * Apply patch 11_manpages_are_not_local.diff to please lintian.
+  * Update TODO.Debian - and rename to TODO in source to make sure it
+    gets included (although only in uw-imaps package) by dh_installdocs.
+  * Change 2002 and 2003 to __VER__ a few places in README.Debian files.
+  * Parse Debian version more cleverly: Reuse simply expanded variables.
+    Also, add UPSTREAMVER and use it to automatically update watch file.
+  * Attempt asking both debconf questions in libc-client postinst.
+    Closes: Bug#229842 (thanks to Jay Berkenbilt <ejb@ql.org>).
+  * Add note in libc-client.postconf explaining the use of printf.
+  * Improve logcheck rules. Closes: Bug#244324 (thanks to Paul Traina).
+  * Check for up-to-date deban/rules before patching.
+  * Cleaned up debian/copyright:
+    + Replace info contained in changelog with note on "GNU systems".
+    + Declare each topic more strictly.
+    + Mention "licensing info" together with copyright.
+    + Add (historical) copyright info of Stanford University.
+  * Correct dependency for transition packages, and shorten description.
+  * Tighten build-dependency on debhelper to please lintian.
+  * Set urgency=high as we want this in sarge.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 13 Oct 2004 17:56:46 +0200
+
+uw-imap (7:2002edebian1-3) unstable; urgency=low
+
+  * Have libc-client-dev be priority optional.
+  * Add japanese debconf localisation. Closes: Bug#224766 (thanks to
+    Kenshi Muto <kmuto@debian.org>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 22 Mar 2004 17:14:32 +0100
+
+uw-imap (7:2002edebian1-2) unstable; urgency=low
+
+  * Change order of po2debconf and local version hack, for the packaging
+    l12n to look more sane from the outside. Closes: Bug#235172, thanks
+    to Martin Quinson <Martin.Quinson@tuxfamily.org>.
+  * Correctly check for a debconf response of "true" (not "yes") to the
+    question of enabling plaintext passwords. Closes: Bug#227709,
+    231115 (thanks to John McMonagle <johnm@advocap.org> and Stefan
+    Andersson <stefan@ryo-ohki.mine.nu>).
+  * The above also closes: Bug#190727 (thanks to Ryan Sinn
+    <ryan@sinn.org>). In fact it only resolves the problem mentioned
+    last - the main part is unreproducible and not due to purging the
+    replaced package as I first suspected).
+  * Recommend exim4 instead of exim. Closes: Bug# 228566 (thanks to Marc
+    Haber <mh+debian-packages@zugschlus.de>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 22 Mar 2004 15:46:41 +0100
+
+uw-imap (7:2002edebian1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove patches applied upstream (without mentioning their origin!!):
+  * Adapt patches to the new release (some patches adopted upstream -
+    the rest is disliked upstream, but at least name them well for
+    others to adopt):
+    + 01_shlib.diff: Several updates/corrections:
+      - Correctly read "ARCHIVENAME" (not "$ARCHIVENAME"), and make a
+        note in TODO about checking if this allows for further cleanup
+      - Have new target lnps match changes to old target lnp
+      - Add new target ldbs to toplevel Makefile, as BUILDTYPE is not
+        overridable in ldb target.
+      - Remove unused compile option "-DNFSKLUDGE"
+    + 02_mailutils.diff: Rename to 02_mailutils_use_shlib.diff
+    + 03_portability.diff: Dropped (applied upstream)
+    + 04_cppfix.diff: Dropped. Instead a note is added to README.Debian
+      in the libc-client-dev package recommending to use compile flag
+      "-fno-operator-names" when compiling with g++ (as suggested - in a
+      tiny note buried in the source - by upstream)
+    + 05_debian-customization.diff: Split in three parts:
+      - Drop compile tweaks in favor of using new "ldb" make target.
+      - Rename relevant parts into 03_avoid_hardcoded_optimizaion.diff
+      - Rename remains into 04_no_binaries_below_etc.diff
+    + 06_limited_advertise.diff: Dropped (applied upstream)
+    + 08_ssl.diff: Dropped (as intended in 7:2002ddebian1-3)
+    + 09_kerberos.diff: Droped in favor of enabling Kerberos V support
+      at compile time (as suggested by upstream in Makefile comment).
+    + 99_needed_for_pine_smime_support.diff: Dropped (applied upstream)
+    + 99_separate_ssl_key_dir.diff: Dropped (applied upstream)
+  * Update TODO.Debian.
+  * Change libc-client-dev to section=extra (to match libkrb5-dev and
+    comerr-dev).
+  * Correct pointers to libc-client in README.Debian of uw-imapd and
+    ipopd.
+  * Only warn once about dropped Maildir support. Closes: Bug#214508.
+  * Correct typo in debconf question (thanks to Andreas Rottmann
+    <rotty@debian.org>). Closes: Bug#208571.
+  * Update danish translation.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 10 Dec 2003 03:27:41 +0100
+
+uw-imap (7:2002ddebian1-4) unstable; urgency=medium
+
+  * Remove RCS directory causing trouble on autobuilders (closes:
+    Bug#212209).
+  * Setting urgency=medium as the above should change nothing in the
+    result packages, and is holding them from reaching testing.
+  * Correction: 08_ssl.diff is not yet removed, as stated below for
+    7:2002ddebian1-3 (it is only cosmetic, and requires changes to
+    99_separate_ssl_key_dir.diff which will be removed on next upstream
+    release anyway).
+  * change -dev package to the generic libc-client-dev, and replace
+    libc-client4.7-dev (this should hopefully make life easier again for
+    build-dependencies of other packages - sorry for the mess).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 26 Sep 2003 10:31:34 +0200
+
+uw-imap (7:2002ddebian1-3) unstable; urgency=low
+
+  * Adapt to new PAM structure, and depend on libpam-runtime (>= 0.76-
+    13.1).
+  * Fix watch file to compare with non-debian version number.
+  * Debian Policy 3.6.1.
+  * Build using the gcc option -D_REENTRANT (required by Debian Policy
+    chapter 10.2.).
+  * Build using the gcc option -Wl,-z,defs (suggested by Debian Policy
+    chapter 10.2.).
+  * Patch cleanups as recommended by Mark Crispin (upstream author) and
+    Jaldhar H. Vyas (former maintainer):
+    + time.h inclusion in auth_md5.c (no longer needed).
+    + NETSCAPE_BRAIN_DAMAGE and ENTOURAGE_BRAIN_DAMAGE ("Should not be
+      necessary, and disables an important client debugging feature").
+    + tmp array and myHomeDir paranoia (relates to old fixed bugs).
+    + SSLTYPE=unix.nopwd (no longer relevant).
+    + 08_ssl.diff removed (options added to toplevel Makefile instead)
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 25 Aug 2003 04:11:06 +0200
+
+uw-imap (7:2002ddebian1-2) unstable; urgency=high
+
+  * enable compile-time option restrictedBox to disallow paths beginning
+    with .. or / (closes: Bug#198560). Set urgency=high.
+  * Correct watch file, and include it in version update semi-
+    automation.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri,  4 Jul 2003 20:01:38 +0200
+
+uw-imap (7:2002ddebian1-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Seems the 2003 branch will stay unstable, so use yet another epoch
+    and get back to the stable branch (which is in fact identical to
+    newest unstable release except for the nntp code).
+  * Drop Maildir patch. The code has always been buggy, is unsupported
+    upstream and hasn't been maintained for several years. In addition,
+    it may be the cause of security issues. Closes: Bug#159871, 188351.
+    The code and texts related to Maildir is kept in the source package
+    for those interested in recompiling locally, but is no longer
+    officially supported by Debian.
+  * Warn on upgrade about dropped Maildir support.
+  * Tweak po2debconf handling to support backporting to woody (thanks to
+    Colin Watson for similar tweaks to openssh).
+  * Make both libc-client questions boolean, lower debconf dependency to
+    only a recommendation, and fallback to simple echo'ing when not
+    available. Override lintian warning about it.
+  * Drop using {misc:Depends}, as it dublicates the po2debconf hack.
+  * Drop irrelevant use of ${shlibs:Depends} for -dev package as well.
+  * Recommend mail-transport-agent for ipopd (as done with uw-imapd).
+  * Lower libc-client dependency on uw-mailutils to suggests (not
+    recommends).
+  * Improve wording in libc-client debconf template and README about
+    plaintext authentication.
+  * Fix cbs snippet to unpatch in reverse order. Closes: Bug#180701
+    (thanks to Kenshi Muto).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 31 May 2003 17:51:35 +0200
+
+uw-imap (6:2003debian0.0304182231-1) unstable; urgency=low
+
+  * New upstream development snapshot.
+    + Fix recognizing INBOX in mbox driver.
+    + Fix resolving myMailboxDir (Setting mail-subdirectory in
+      /etc/c-client.cf is now fully respected, so closes: Bug#153120).
+    + Documentation update: rfc3516 is no longer a draft (not packaged).
+    + Misc. small changes to non-Debian-related operating systems.
+  * Use and buildepend on official d-shlibs again.
+  * Build-depend on newer dephelper that properly supports (and itself
+    pulls in build-dependency on) po-debconf.
+  * Update 01_shlib.diff.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 21 Apr 2003 15:55:59 +0200
+
+uw-imap (6:2003debian0.0304071905-1) unstable; urgency=low
+
+  * New upstream development snapshot.
+  * Make sure /etc/c-client.cf is always initiated correctly if there.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed,  9 Apr 2003 02:26:52 +0200
+
+uw-imap (6:2003debian0.0303251143-1) unstable; urgency=low
+
+  * New upstream development snapshot
+    + Update to internal documentation (not packaged).
+    + Correctly check for INBOX, not just any ?NBOX.
+    + Check for length of strings several places.
+  * Move libc-client2003debian-dev to section libdevel.
+  * Claim compliance with Policy 3.5.9 (no changes needed).
+  * Add pt_BR debconf translation provided by André Luís Lopes
+    <andrelop@ig.com.br>. This closes: Bug#185892.
+  * Enable translation of even verbatim copied debhelper choices to
+    please lintian.
+  * Correctly translate *.template.in files. Provide debian/update-po
+    script to do it semi-automatically later on.
+  * Install source of mtest as example and drop building the binary at
+    all. This closes: Bug#184638 (thanks to turgon@debian.org).
+  * Switch debhelper hint from DH_COMPAT to debian/compat.
+  * Correctly add plaintext hint to already existing /etc/c-client.cf.
+    This closes: Bug#182779 (thanks to Robert CHERAMY
+    <robert@cheramy.net>).
+  * There's been no name clash since the cleanup in
+    6:2003debian0.0302102043-1. This closes Bug#180755.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue,  8 Apr 2003 02:09:55 +0200
+
+uw-imap (6:2003debian0.0303051641-2) unstable; urgency=low
+
+  * Avoid removing /etc/c-client.cf on purge as the file is shared
+    between all libc-clientXXX packages.
+  * Rewrite documentation:
+    + Add notes about manual removal of /etc/c-client.cf to
+      README.Debian and debconf template.
+    + Tweak layout of README.Debian files to be "conformant" with
+      txt2html style.
+    + Copy README.Debian notes about PAM and CRAM-MD5 from ipopd to
+      imapd.
+    + Clarify POP2 topic.
+    + Rewrite libc-client debconf template to not talk about the past,
+      and refer to the documentation for details.
+  * Change recommended ipopd choices from pop3 to both pop3 and pop3s,
+    and similarly with imap2 and imaps.
+  * Use (and build-depend on) po-debconf. Add danish debconf l10n file.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 16 Mar 2003 03:03:59 +0100
+
+uw-imap (6:2003debian0.0303051641-1) unstable; urgency=low
+
+  * New upstream developer snapshot.
+  * Add kerberos LDFLAGS to debian/patches/01_shlib.diff (and add a note
+    in TODO.Debian about the lack of testing) and correct path to
+    kerberos libraries in debian/patches/05_debian-customization.diff.
+    This closes: Bug#183926 (thanks to Sergio Talens-Oliag
+    <sto@debian.org>).
+  * Use a local hacked copy of d-devlibdeps to properly deal with
+    libkrb5-dev and comerr-dev.
+  * Move optimization CFLAGS from upstream Makefile to debian/rules to
+    support DEB_BUILD_OPTIONS.
+  * Restore old changelog entries lost in the -ssl fork (include it in
+    the source package only).
+  * Add general introduction to c-client in extended description of
+    c-client-related packages.
+  * Claim compliance with Debian Policy 3.5.9.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 14 Mar 2003 20:05:56 +0100
+
+uw-imap (6:2003debian0.0302202017-1) unstable; urgency=low
+
+  * New upstream developer snapshot.
+  * Have libc-clientXXX-dev depend on libc-clientXXX (closes:
+    Bug#183036, thanks to Adam Conrad <adconrad@0c3.net>).
+  * Tighten debhelper sed magic to only deal with files.
+  * Relax build-dependency on d-shlibs a bit (to leave room for
+    unooficial bacports).
+  * Remove bogus comments in debian/rules about revision numbers.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun,  2 Mar 2003 00:52:20 +0100
+
+uw-imap (6:2003debian0.0302102043-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * New epoch: Interpret "version number" (for which the license has
+    special demands) as only the first segment of the longer string used
+    with snapshots and betas (as is done in the documentation).
+    This is to allow naming snapshots and other irregular releases
+    consistently with regular releases ones.
+    It does not excuse my recent stupidity in packaging a developer
+    snapshot (although one could argue that it provoked cleaning up for
+    next sane excuse).
+  * Change debian/rules to correctly recognize VERSION (including
+    appending alphabetic character(s)).
+  * Add a REVISION field for dealing with snapshots changing the library
+    (no excuse for my current stupidity, but may come in handy if
+    security cases like 2002a.dev.snap.0212051126 happens again, and
+    library changes between snapshots).
+  * Correct symlink in libc-client2003debian0 package.
+    (Closes: Bug#180699).
+  * Use the common debconf area "libc-client" instead of versioned
+    string (only question is about a file shared among all versions of
+    libc-client anyway).
+  * Sync with latest CBS: avoid non-POSIX test syntax.
+  * Use sed again to handle VERSION more automatic, and check for
+    changes to debian/control (but still avoid editing it
+    automatically!).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 13 Feb 2003 00:48:25 +0100
+
+uw-imap (5:2003.dev.snap.0301311011debian-2) unstable; urgency=low
+
+  * Have uw-mailutils conflict with older uw-imapd and uw-imapd-ssl to
+    ease upgrades from woody (thanks to Zed Pobre <zed@debian.org>).
+    Closes: Bug#180512.
+  * Fix watchfile (it still doesn't work however, but that's another
+    story).
+  * Remove a TODO about dynamic linking - it works correctly now :-).
+  * Update copyright (only changes are the version and years covered).
+  * Remove README.debian for libc-client2003-dev, as it speaks only
+    about enabling SSL which is now enabled by default.
+  * Debhelper files renamed for the c-client2002 -> c-client2003 shift
+    (how embarrasing).
+  * Replace 2002 -> 2003 in various Debian documentation and packaging
+    files.
+  * Refer to /var/mail in debian/mlock.pod, generate mlock.1 from that
+    and build-depend on perl.
+  * Install mtest only as example file as it according to the FAQ is
+    "not something that you would install".
+  * Remove obsolete dh_undocumented from debian/rules.
+  * Add linda overrides.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 11 Feb 2003 02:50:03 +0100
+
+uw-imap (5:2003.dev.snap.0301311011debian-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * Libc-client changed, so bump up its name.
+  * Fix ipopd postinst to generate proper certificate (thanks to Nikita
+    V. Youshchenko <yoush@cs.msu.su>). This closes: Bug#179993, 180314.
+  * Use official d-shlibdeps again, and bump up build-dependency.
+  * Improve resolving  in debian/rules (upstream uses no dots but
+    sometimes characters).
+  * Update ipopd logcheck entries (ignore more errors due to lost
+    connections from clients).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun,  9 Feb 2003 05:42:42 +0100
+
+uw-imap (5:2002b.debian-5) unstable; urgency=low
+
+  * Update local d-devlibdeps (and send a d-shlibs bugreport regarding
+    the openssl errors). Closes: Bug#178629 (thanks to James Troup
+    <james@nocrew.org>).
+  * Correct symlinks to ipopd manpage. Closes: Bug#178208 (thanks to
+    Remco Blaakmeer <j.blaakmeer@chello.nl>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 28 Jan 2003 04:02:29 +0100
+
+uw-imap (5:2002b.debian-4) unstable; urgency=low
+
+  * Fix linking against openssl (thanks to Adam Conrad
+    <adconrad@0c3.net>). Closes: Bug#177719.
+  * New hack to d-devlibdeps to support the above (also thanks to Adam
+    Conrad). Bugreport filed against d-shlibs.
+  * build-depend temporarily on bash (needed by d-devlibdeps).
+  * Fix ipopd logcheck strings (match pop3 instead of pop).
+  * Improve dialog regarding plaintext passwords to explicitly mention
+    cramd-md5 passwords (thanks to Tom Allison <tallison@tacocat.net>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 22 Jan 2003 20:48:23 +0100
+
+uw-imap (5:2002b.debian-3) unstable; urgency=low
+
+  * Really teach logcheck about APOP (added it to the wrong string).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 19 Jan 2003 19:17:59 +0100
+
+uw-imap (5:2002b.debian-2) unstable; urgency=low
+
+  * Correct permisions for mlock.
+  * Teach logcheck about APOP login (thanks to Carlos Perelló Marín
+    <carlos@gnome-db.org>). Closes: Bug#177268.
+  * Hack to maildir patch hopefully fixing Bug#108719 (please test).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 19 Jan 2003 18:24:11 +0100
+
+uw-imap (5:2002b.debian-1) unstable; urgency=low
+
+  * New upstream release.
+  * Repackage using debhelper v4, d-shlibs and (for now only patching
+    rules from) Colin's Build System (instead of DBS and debhelper v2).
+  * Avoid automatic update of debian/control during build (fail instead
+    if libc-client-dev version is out of sync).
+  * Copyright updates:
+    + Use non-symlinked source URL
+    + Remove irrelevant (and outdated) info on version contained
+    + Add note that source was repackaged from upstream .tar.Z archive
+    + Add credit notes about Maildir patch
+    + Add Upstream Author (without email address)
+    + Add links to additional info
+    + Update license to refer to version 2002a of IMAP toolkit
+  * Add TODO about improved certificate handling.
+  * Updated logcheck files (thanks to Ivan Baldo <ibaldo@conatel.com.uy>
+    for reminding me). Closes: Bug#176884.
+  * Only change certificate permissions when creating them.
+  * Remove libc-client2002 dependency on libssl and libkrb (it seems it
+    is not dynamic linked to the library after all. Add an investigation
+    to the TODO as well.
+  * Use a local hacked copy of d-devlibdeps to properly deal with libpam
+    and e2fsprogs.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 18 Jan 2003 20:42:24 +0100
+
+uw-imap (5:2002a.dev.snap.0212051126debian-5) unstable; urgency=low
+
+  * Really change Maintainer field.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun,  5 Jan 2003 14:27:20 +0100
+
+uw-imap (5:2002a.dev.snap.0212051126debian-4) unstable; urgency=low
+
+  * Remove .orig and other cruft from patches.
+  * Enable workaround for Entourage (better safe than sorry - it does no
+    harm to conforming IMAP clients (or to Enourage).
+  * Change Netscape workaround to redirect to page below my own Debian
+    home (same content, tidy'ed and Jaldhar credited in source).
+  * Improve auto-generated certificates, and be noisy about creating
+    them (Encourage replacing them).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 27 Dec 2002 17:50:06 +0100
+
+uw-imap (5:2002a.dev.snap.0212051126debian-3) unstable; urgency=low
+
+  * Package adopted, closes bug#174094. Thanks, Jaldhar, for doing such
+    a great job (i'll wait a bit switching to dovecot myself).
+  * Changing maintainer field.
+  * Correct SSLCERTS path (The wrong path is symlink'ed by openssl to
+    the right location, so it is only cosmetic: it shows up in logfiles.
+  * Add patch to locate SSL keys in /etc/ssl/private (with fallback to
+    the old location for self signed keys).
+  * Add patch to support body cleanup in c-client (c-client part of Pine
+    S/MIME patch needed when linking dynamically).
+  * Avoid removing certificate on purge, just warn if it exists (we have
+    no way of knowing wether it is ours to remove). Closes bug#161212
+    (thanks to Chris Brown <chrisb@chibi.ca>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 27 Dec 2002 07:54:47 +0100
+
+uw-imap (5:2002a.dev.snap.0212051126debian-2) unstable; urgency=low
+
+  * libc-client2002-dev: libkrb5-dev added to depends.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 16 Dec 2002 10:09:05 -0500
+
+uw-imap (5:2002a.dev.snap.0212051126debian-1) unstable; urgency=high
+
+  * New upstream version.
+  * [SECURITY] fixes buffer overflow that could result in an authenticated 
+    user getting a shell.
+  * ipopd-ssl: Corrected typos in description (Closes: #167874)
+  * Added documentation for POP2 not supporting plaintext logins
+    (Closes: #169318)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 13 Dec 2002 10:25:01 -0500
+
+uw-imap (4:2002rc10debian-1) unstable; urgency=low
+
+  * Ok this is the release which will be uploaded to Debian.
+  * New upstream version.
+  * I've changed my mind again.  plaintext authentication will be disabled
+    by default but libc-client2002 will ask you via debconf if you want to
+    use the config file to allow it (See
+    /usr/share/doc/libc-client2002/README.Debian.)
+  * proper dependencies for kerberos stuff added.
+  * Closes: #152219, #150190, #164943, #164454, #16785
+    see previous changelog entries for details.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri,  1 Nov 2002 15:23:28 -0500
+
+uw-imap (4:2002rc8debian-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fixed segfault in maildir driver.  Thanks Christoph Martin.
+    (Closes: #152219)
+  * Mailboxes should no longer be reported twice.  Thanks Bas Van Sisseren
+    (Closes: #150190)
+  * arch-independent packages built the right way. (Closes: #164943)
+  * Documentation added for configuring various mail clients with SSL/TLS.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 21 Oct 2002 01:37:52 -0400
+
+uw-imap (4:2002rc7debian-1) unstable; urgency=low
+
+  * New upstream version.  SSL/TLS functionality is now built in so the
+    old -ssl packages are obsolete.
+  * WARNING: plaintext logins have been disabled for non SSL/TLS
+    connections.  See /usr/share/doc/libc-client2002/README.Debian for
+    further information. (Closes: #164454)
+  * uw-imapd, ipopd: Kerberos support added. (Closes: #160785)
+  * uw-imapd: The old chkmail, imapcopy, imapmove, imapxfer, mbxcopy,
+    mbxcreat, and mbxcvt programs have been replaced by mailutil in a new
+    package called uw-mailutils which also contains tmail and dmail.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 15 Oct 2002 14:01:34 -0400
+
+uw-imap-ssl (4:2001adebian-7) unstable; urgency=low
+
+  * Recompiled with the latest libssl
+  * Some additional rules to quiet logcheck output.  Thanks Paul Traina.
+    (Closes: #145958)
+  * Added a note to README.Debian about IDLE support (or lack of it.)
+    (Closes: #146733)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun, 16 Jun 2002 01:30:47 -0400
+
+uw-imap-ssl (4:2001adebian-6) unstable; urgency=low
+
+  * source re-uploaded and transferred to main.
+  * uw-imapd-ssl:  Fixed typo in certificate creation in postinst.
+    (Closes: #137196)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sat, 23 Mar 2002 23:49:45 -0500
+
+uw-imap-ssl (4:2001adebian-5) unstable; urgency=low
+
+  * libc-client-ssl2001: Fix potential segmentation fault.  Thanks Hadmut Danisch.
+    (Closes:  #128830)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun, 13 Jan 2002 15:10:04 -0500
+
+uw-imap-ssl (4:2001adebian-4) unstable; urgency=high
+
+  * Change location of mail spool to /var/mail as per policy.
+    (Closes: #125314)
+  * libc-client-ssl2001: Fix speeling mistake in description.
+    (Closes: #124902)
+  * The text which contained another spellink mistake doesn't exist 
+    anymore.  (Closes: #125450)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 17 Dec 2001 23:26:08 -0500
+
+uw-imap-ssl (4:2001adebian-3) unstable; urgency=high
+
+  * The "Woodwards' Gripe Water" release.
+  * Redid the patches.  This should fix the shared library problems
+    (Closes: #121720, #121768, #121230)
+  * uw-imapd-ssl: Removed pine from Suggests as it is no longer an
+    official Debian package.
+  * Changed occurences of /usr/doc to /usr/share/doc in READMEs.
+    (Closes: #124081)
+  * uw-imapd-ssl, ipopd-ssl: Fixed bad common name in autogenerated 
+    certificate (Closes: #124115)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 17 Dec 2001 13:49:08 -0500
+
+uw-imap-ssl (4:2001adebian-2.1) unstable; urgency=low
+
+  * Test to see if we have fixed the shared library problems.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 10 Dec 2001 15:05:11 -0500
+
+uw-imap-ssl (4:2001adebian-2) unstable; urgency=low
+
+  * uw-imapd-ssl: Added imap3 service to inetd.conf for those clients that 
+    need it.  See /usr/share/doc/uw-imapd-ssl/README.Debian for info on 
+    turning it off if you don't need it.  (Closes: #120524)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 22 Nov 2001 12:51:13 -0500
+
+uw-imap-ssl (4:2001adebian-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 19 Nov 2001 03:09:17 -0500
+
+uw-imap-ssl (2:2001a.rc4debian-1) unstable; urgency=high
+
+  * New upstream release.
+  * libc-client-ssl2001-dev:  Dependency on libssl-dev added.
+    (Closes: #118953)
+  * libc-client-2001: making of shlibs improved.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 15 Nov 2001 22:31:59 -0500
+
+uw-imap-ssl (2:2001a.rc2debian-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 23 Oct 2001 23:45:51 -0400
+
+uw-imap-ssl (1:2001rc1debian-1) unstable; urgency=high
+
+  * New upstream release.
+  * Source reworked to use dbs.  There wasn't much in the way of
+    documentation so let me know if there were any errors with this.
+  * Brand new all-singing, all-dancing, maildir patch from Miquel Van
+    Smoorenburg.
+  * Also a patch from Miquel for just advertising private and shared
+    namespaces.  See /usr/share/doc/libc-client-ssl2001/README.Debian for 
+    details.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 28 Sep 2001 06:03:55 -0400
+
+uw-imap-ssl (1:2001beta010722debian-4) unstable; urgency=high
+
+  * shared libs need to be linked with gcc, not ld. (Closes: #108091)
+  * for maildirs INBOX should be ~/Maildir.
+  * Most existing maildir problems should be fixed at this point.
+    (Closes: #46557, #59546, #97432, #104208) Maildir users please test
+    and if there are still issues reopen the bugs or file new ones.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 10 Aug 2001 10:58:07 -0400
+
+uw-imap-ssl (1:2001beta010722debian-3) unstable; urgency=high
+
+  * uw-imapd-ssl: Fixed wrapped lines in logcheck filter (Closes: #107726)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon,  6 Aug 2001 01:34:13 -0400
+
+uw-imap-ssl (1:2001beta010722debian-2) unstable; urgency=low
+
+  * libc-client-ssl2001: sysinbox() was only looking at ~/Mailbox not 
+    /var/mail/$USER.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 31 Jul 2001 11:19:37 -0400
+
+uw-imap-ssl (1:2001beta010722debian-1) unstable; urgency=low
+
+  * New upstream version.  Apologies for the hideous version number.
+    Despite the 'beta' this is actually the current stable version. (Go figure.)
+  * uw-imapd-ssl: linked imapcopy.1 to imapmove.1 (Closes: #99574)
+  * uw-imapd-ssl: You shouldn't get the message "Can't create mailbox node
+    ~/mbox: File exists." anymore (Closes: #66605, #71111)
+  * uw-imapd-ssl: New feature in this version should fix problems with
+    Outlook, Outlook Express (Closes: #73017, #80574)
+  * libc-client-ssl2001: fixed up struct SEARCHPGM member names so they
+    work in ANSI C++. (Closes: #102844)
+  * ipopd-ssl: Added a filter for logcheck (Closes #100899)
+  * uw-imapd-ssl:  Added a note warning the provided certificate  will expire 
+    in a year.  (Closes: #99072)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 30 Jul 2001 10:20:02 -0400
+
+uw-imap-ssl (1:2000cdebian-6) unstable; urgency=low
+
+  * libc-client-ssl2000:  Changed shared lib build method (Closes: #98649)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 24 May 2001 20:17:13 -0400
+
+uw-imap-ssl (1:2000cdebian-5) unstable; urgency=high
+
+  * uw-imapd-ssl:  Fixed typo in postinst which prevented certificate from
+    being generated. (Closes: #97286)
+  * uw-imapd-ssl: Added a filter for logcheck (Closes: #97742)
+  * uw-imapd-ssl,ipopd-ssl: Now we just update inetd entries not remove 
+    and then readd them (Closes: #98444)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 24 May 2001 00:25:11 -0400
+
+uw-imap-ssl (1:2000cdebian-4) unstable; urgency=low
+
+  * I've not had time to do all the work on this package that I want to
+     but I thought I'd at least fix some of the easier bugs in the
+     meantime.
+  * libc-client-ssl2000-dev: conflicts with libc-client4.7-dev
+    (Closes: #92426)
+  * uw-imapd-ssl,ipopd-ssl: added dependency on openssl (Closes: #93257,#93690)
+  * uw-imapd-ssl,ipopd-ssl: generated certificate now expires after 365 days
+    instead of 30 (Closes: #95585)
+  * libc-client-ssl2000:  Hopefully fixed, . and .. showing up as mail in
+    maildirs
+  * New maildir patch from http://greboguru.org/qmail/
+
+ -- Jaldhar H. Vyas <jaldhar@jyoti.braincells.com>  Tue,  8 May 2001 10:00:32 -0400
+
+uw-imap-ssl (1:2000cdebian-3) unstable; urgency=high
+
+  * Backed out Tollefs' patch while I investigate why it isn't working
+    for some people.  Unfortunately my mail server has chosen this moment
+    to blow up so I have no email and can't respond to the bug submitters.
+    Rest assured I will do so as soon as I can.  Meanwhile this should at
+    least solve your immediate problems.  If it doesn't please mail the 
+    debian-devel mailing list.  I'll read it through the web interface.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sat, 31 Mar 2001 00:07:08 -0500
+
+uw-imap-ssl (1:2000cdebian-2) unstable; urgency=low
+
+  * uw-imapd-ssl,ipod-ssl: Added a dependancy for openssl so we have
+    /etc/ssl/certs (closes: #90175)
+  * libc-client-ssl2000:  Add patch to make it respect $MAIL when
+    returning mailbox (Thanks Tollef Fog Heen) (Closes: #55206)
+  * Updated to latest policy version/build dependencies.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 23 Mar 2001 02:14:01 -0500
+
+uw-imap-ssl (1:2000cdebian-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 13 Feb 2001 01:13:09 -0500
+
+uw-imap-ssl (1:2000bdebian-2) unstable; urgency=high
+
+  * ipopd-ssl: fixed broken line in postrm (Gaah! I've got to stop using pico) 
+    (closes: #84023)
+  * remove -L/usr/lib from Makefile.ssl which caused problems for autobuilders
+    (closes: #83792, #84001)
+ -- Jaldhar H. Vyas <jaldhar@jyoti.braincells.com>  Mon, 29 Jan 2001 10:21:23 -0500
+
+uw-imap-ssl (1:2000bdebian-1) unstable; urgency=high
+
+  * New upstream release
+  * linked against the latest SSL libraries (Closes: #82191, #82274)
+  * removed extra newline in postrm (Closes: #82936)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun, 21 Jan 2001 01:01:23 -0500
+
+uw-imap-ssl (2000debian-3) unstable; urgency=low
+
+  * I will get these dependencies correct one day dammit
+  * Properly link to SSL libraries now.
+  * Corrected error in shlibs file for libc-client-ssl2000
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sat, 25 Nov 2000 02:40:19 -0500
+
+uw-imap-ssl (2000debian-2) unstable; urgency=low
+
+  * Fixed bad dependencies 
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed, 15 Nov 2000 09:47:17 -0500
+
+uw-imap-ssl (2000debian-1) unstable; urgency=low
+
+  * New package with SSL support compiled in.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 14 Nov 2000 15:46:35 -0500
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd.templates
+++ uw-imap-2007b~dfsg/debian/uw-imapd.templates
@@ -0,0 +1,35 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: uw-imapd/protocol
+Type: multiselect
+Choices: imap2, imaps, imap3
+Default: imap2, imaps
+_Description: Server ports and protocols to support:
+ Please choose the server ports and protocols to activate.
+ .
+  imap2: IMAP 4rev1 on TCP port 143 with TLS support;
+  imaps: IMAP 4rev1 on TCP port 993 with SSL support;
+  imap3: (obsolete) IMAP 3 on TCP port 220 with TLS support.
+ .
+ It is recommended to activate both imap2 and imaps.
+ .
+ As the ports and protocols choice may have been overridden by local
+ changes, you may need to enforce the choice and run the package
+ configuration again with 'dpkg-reconfigure uw-imapd'.
+
+Template: uw-imapd/force_debconf_choice
+Type: boolean
+Default: false
+_Description: Enforce port selection?
+ The uw-imap daemon supports listening simultaneously on several ports.
+ .
+ As the ports and protocols choice may have been overridden by local
+ changes, you may need to enforce the choice and run the package
+ configuration again with 'dpkg-reconfigure uw-imapd'.
--- uw-imap-2007b~dfsg.orig/debian/__PKG__.postrm._in
+++ uw-imap-2007b~dfsg/debian/__PKG__.postrm._in
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+set -e
+
+pkg="__PKG__"	# basename of package
+cert="__CERT__"	# basename of certificate
+daemonsets="__DAEMONSETS__"	# space-seperated list of colon-seperated list of port and binary name (or path if not /usr/sbin)
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+##
+## Remove imapd from inetd.conf
+##
+
+if [ "$1" = "purge" ]; then
+	UPDATE_INETD_ARG='--remove'
+else
+	# Note that we disable in upgrades too
+	UPDATE_INETD_ARG='--disable'
+fi
+
+db_get "$pkg/protocol"
+for debconf_entry in `echo "$RET" | tr ',' ' '`; do
+	seen=""
+	for daemonset in $daemonsets; do
+		service="`echo "$daemonset" | awk -F: '{ print $1 }'`"
+		if [ "$debconf_entry" = "$service" ]; then
+			if [ -x /usr/sbin/update-inetd ]; then
+				update-inetd $UPDATE_INETD_ARG "${service}"
+			fi
+			seen="yes"
+			break
+		fi
+	done
+	if [ "$seen" != "yes" ]; then
+		echo "WARNING: Unsupported debconf value \"$debconf_entry\" in \"$pkg/protocol\"" >/dev/stderr
+	fi
+done
+
+if [ "$1" = "purge" ] && [ -f /etc/ssl/certs/$cert.pem ]; then
+	echo "SSL certificate /etc/ssl/certs/$cert.pem is NOT removed."
+	echo "Please remove manually if required."
+#	cd /etc/ssl/certs
+#	PATH=$PATH:/usr/bin/ssl
+#	rm -f `openssl x509 -noout -hash < $cert.pem`.0 || true
+#	if [ -f $cert.pem ]; then rm -f $cert.pem; fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- uw-imap-2007b~dfsg.orig/debian/copyright_hints
+++ uw-imap-2007b~dfsg/debian/copyright_hints
@@ -0,0 +1,532 @@
+Apache-2.0 [1988-2006 University of Washington]: CONTENTS
+	SUPPORT
+	docs/CONFIG
+	docs/IPv6.txt
+	docs/Y2K
+	docs/calendar.txt
+	docs/commndmt.txt
+	docs/drivers.txt
+	docs/formats.txt
+	docs/imaprc.txt
+	docs/internal.txt
+	docs/locking.txt
+	docs/md5.txt
+	docs/mixfmt.txt
+	docs/naming.txt
+	makefile.nt
+	makefile.ntk
+	makefile.os2
+	makefile.w2k
+	makefile.wce
+	src/ansilib/memmove.c
+	src/ansilib/memmove2.c
+	src/ansilib/strpbrk.c
+	src/ansilib/strstr.c
+	src/ansilib/strtoul.c
+	src/c-client/auth_ext.c
+	src/c-client/auth_gss.c
+	src/c-client/auth_log.c
+	src/c-client/auth_pla.c
+	src/c-client/c-client.h
+	src/c-client/flstring.c
+	src/c-client/flstring.h
+	src/c-client/fs.h
+	src/c-client/ftl.h
+	src/c-client/netmsg.c
+	src/c-client/netmsg.h
+	src/c-client/newsrc.c
+	src/c-client/newsrc.h
+	src/c-client/nl.h
+	src/c-client/nntp.h
+	src/c-client/smanager.c
+	src/c-client/sslio.h
+	src/charset/big5.c
+	src/charset/cns11643.c
+	src/charset/decomtab.c
+	src/charset/gb_12345.c
+	src/charset/gb_2312.c
+	src/charset/ibm.c
+	src/charset/iso_8859.c
+	src/charset/jis_0208.c
+	src/charset/jis_0212.c
+	src/charset/koi8_r.c
+	src/charset/koi8_u.c
+	src/charset/ksc_5601.c
+	src/charset/tis_620.c
+	src/charset/tmap.c
+	src/charset/viscii.c
+	src/charset/windows.c
+	src/dmail/Makefile
+	src/imapd/Makefile
+	src/imapd/imapd.8
+	src/imapd/makefile.nt
+	src/imapd/makefile.ntk
+	src/imapd/makefile.w2k
+	src/ipopd/Makefile
+	src/ipopd/ipopd.8
+	src/ipopd/makefile.nt
+	src/ipopd/makefile.ntk
+	src/ipopd/makefile.w2k
+	src/mailutil/Makefile
+	src/mailutil/makefile.nt
+	src/mailutil/makefile.ntk
+	src/mailutil/makefile.w2k
+	src/mlock/Makefile
+	src/mtest/Makefile
+	src/mtest/makefile.nt
+	src/mtest/makefile.ntk
+	src/mtest/makefile.os2
+	src/mtest/makefile.w2k
+	src/osdep/amiga/Makefile
+	src/osdep/amiga/ckp_std.c
+	src/osdep/amiga/drivers
+	src/osdep/amiga/dummy.h
+	src/osdep/amiga/env_ami.h
+	src/osdep/amiga/fdstring.h
+	src/osdep/amiga/fs_ami.c
+	src/osdep/amiga/ftl_ami.c
+	src/osdep/amiga/gethstid.c
+	src/osdep/amiga/gr_waitp.c
+	src/osdep/amiga/log_std.c
+	src/osdep/amiga/mkauths
+	src/osdep/amiga/nl_ami.c
+	src/osdep/amiga/os_ami.c
+	src/osdep/amiga/os_ami.h
+	src/osdep/amiga/phile.c
+	src/osdep/amiga/pmatch.c
+	src/osdep/amiga/pseudo.c
+	src/osdep/amiga/pseudo.h
+	src/osdep/amiga/scandir.c
+	src/osdep/amiga/ssl_none.c
+	src/osdep/amiga/tcp_ami.h
+	src/osdep/amiga/tz_bsd.c
+	src/osdep/amiga/unix.h
+	src/osdep/amiga/write.c
+	src/osdep/dos/bezrkdos.c
+	src/osdep/dos/drivers.bat
+	src/osdep/dos/drivraux.bat
+	src/osdep/dos/dummy.h
+	src/osdep/dos/dummydos.c
+	src/osdep/dos/env_dos.c
+	src/osdep/dos/env_dos.h
+	src/osdep/dos/fdstring.h
+	src/osdep/dos/fs_dos.c
+	src/osdep/dos/ftl_dos.c
+	src/osdep/dos/mkautaux.bat
+	src/osdep/dos/mkauths.bat
+	src/osdep/dos/mtestdbw.bat
+	src/osdep/dos/mtestdnf.bat
+	src/osdep/dos/mtestdnv.bat
+	src/osdep/dos/mtestdpc.bat
+	src/osdep/dos/mtestdwa.bat
+	src/osdep/dos/mtestwsk.bat
+	src/osdep/dos/mtxdos.c
+	src/osdep/dos/nl_dos.c
+	src/osdep/dos/os_dbw.c
+	src/osdep/dos/os_dbw.h
+	src/osdep/dos/os_dnf.c
+	src/osdep/dos/os_dnf.h
+	src/osdep/dos/os_dnv.c
+	src/osdep/dos/os_dnv.h
+	src/osdep/dos/os_dpc.c
+	src/osdep/dos/os_dpc.h
+	src/osdep/dos/os_dwa.c
+	src/osdep/dos/os_dwa.h
+	src/osdep/dos/os_wsk.c
+	src/osdep/dos/os_wsk.h
+	src/osdep/dos/pmatch.c
+	src/osdep/dos/tcp_dos.h
+	src/osdep/dos/tcp_dwa.h
+	src/osdep/dos/tcp_wsk.h
+	src/osdep/dos/write.c
+	src/osdep/mac/dummy.h
+	src/osdep/mac/dummymac.c
+	src/osdep/mac/env_mac.c
+	src/osdep/mac/env_mac.h
+	src/osdep/mac/fs_mac.c
+	src/osdep/mac/ftl_mac.c
+	src/osdep/mac/linkage.h
+	src/osdep/mac/nl_mac.c
+	src/osdep/mac/os_mac.c
+	src/osdep/mac/os_mac.h
+	src/osdep/mac/osdep.h
+	src/osdep/mac/pmatch.c
+	src/osdep/mac/tcp_mac.h
+	src/osdep/nt/drivers.bat
+	src/osdep/nt/drivraux.bat
+	src/osdep/nt/dummy.h
+	src/osdep/nt/env_nt.h
+	src/osdep/nt/fdstring.h
+	src/osdep/nt/fs_nt.c
+	src/osdep/nt/ftl_nt.c
+	src/osdep/nt/ip4_nt.c
+	src/osdep/nt/ip6_nt.c
+	src/osdep/nt/kerb_mit.c
+	src/osdep/nt/kerb_w2k.c
+	src/osdep/nt/mailfile.h
+	src/osdep/nt/mkautaux.bat
+	src/osdep/nt/mkauths.bat
+	src/osdep/nt/nl_nt.c
+	src/osdep/nt/os_nt.c
+	src/osdep/nt/os_ntk.c
+	src/osdep/nt/os_old.c
+	src/osdep/nt/os_w2k.c
+	src/osdep/nt/pmatch.c
+	src/osdep/nt/pseudo.c
+	src/osdep/nt/pseudo.h
+	src/osdep/nt/setproto.bat
+	src/osdep/nt/ssl_none.c
+	src/osdep/nt/tcp_nt.h
+	src/osdep/nt/unixnt.h
+	src/osdep/nt/write.c
+	src/osdep/nt/yunchan.c
+	src/osdep/nt/yunchan.h
+	src/osdep/os2/auths.cmd
+	src/osdep/os2/drivers.cmd
+	src/osdep/os2/dummy.h
+	src/osdep/os2/dummyos2.c
+	src/osdep/os2/env_os2.c
+	src/osdep/os2/env_os2.h
+	src/osdep/os2/fs_os2.c
+	src/osdep/os2/ftl_os2.c
+	src/osdep/os2/makefile.os2
+	src/osdep/os2/nl_os2.c
+	src/osdep/os2/os_os2.c
+	src/osdep/os2/os_os2.h
+	src/osdep/os2/pmatch.c
+	src/osdep/os2/pseudo.c
+	src/osdep/os2/pseudo.h
+	src/osdep/os2/setproto.cmd
+	src/osdep/os2/tcp_os2.h
+	src/osdep/os2/unixnt.h
+	src/osdep/os2/write.c
+	src/osdep/tops-20/build.ctl
+	src/osdep/tops-20/dummy.h
+	src/osdep/tops-20/dummyt20.c
+	src/osdep/tops-20/env_t20.c
+	src/osdep/tops-20/env_t20.h
+	src/osdep/tops-20/fs_t20.c
+	src/osdep/tops-20/ftl_t20.c
+	src/osdep/tops-20/linkage.h
+	src/osdep/tops-20/log_t20.c
+	src/osdep/tops-20/nl_t20.c
+	src/osdep/tops-20/os_t20.c
+	src/osdep/tops-20/pmatch.c
+	src/osdep/tops-20/tcp_t20.h
+	src/osdep/unix/ckp_1st.c
+	src/osdep/unix/ckp_2nd.c
+	src/osdep/unix/ckp_3rd.c
+	src/osdep/unix/ckp_a41.c
+	src/osdep/unix/ckp_afs.c
+	src/osdep/unix/ckp_bsi.c
+	src/osdep/unix/ckp_cyg.c
+	src/osdep/unix/ckp_dce.c
+	src/osdep/unix/ckp_nul.c
+	src/osdep/unix/ckp_os4.c
+	src/osdep/unix/ckp_pam.c
+	src/osdep/unix/ckp_pmb.c
+	src/osdep/unix/ckp_psx.c
+	src/osdep/unix/ckp_sce.c
+	src/osdep/unix/ckp_sec.c
+	src/osdep/unix/ckp_ssn.c
+	src/osdep/unix/ckp_std.c
+	src/osdep/unix/ckp_sv4.c
+	src/osdep/unix/ckp_svo.c
+	src/osdep/unix/ckp_ult.c
+	src/osdep/unix/crx_nfs.c
+	src/osdep/unix/crx_std.c
+	src/osdep/unix/drivers
+	src/osdep/unix/dummy.h
+	src/osdep/unix/env_unix.h
+	src/osdep/unix/fdstring.h
+	src/osdep/unix/flockcyg.c
+	src/osdep/unix/flockcyg.h
+	src/osdep/unix/flocklnx.c
+	src/osdep/unix/flocksim.h
+	src/osdep/unix/fs_unix.c
+	src/osdep/unix/fsync.c
+	src/osdep/unix/ftl_unix.c
+	src/osdep/unix/gethstid.c
+	src/osdep/unix/getspnam.c
+	src/osdep/unix/gr_wait.c
+	src/osdep/unix/gr_wait4.c
+	src/osdep/unix/gr_waitp.c
+	src/osdep/unix/ip4_unix.c
+	src/osdep/unix/ip6_unix.c
+	src/osdep/unix/ipo_unix.c
+	src/osdep/unix/kerb_mit.c
+	src/osdep/unix/log_bsi.c
+	src/osdep/unix/log_cyg.c
+	src/osdep/unix/log_old.c
+	src/osdep/unix/log_os4.c
+	src/osdep/unix/log_sec.c
+	src/osdep/unix/log_std.c
+	src/osdep/unix/log_sv4.c
+	src/osdep/unix/mkauths
+	src/osdep/unix/nl_unix.c
+	src/osdep/unix/opendir.c
+	src/osdep/unix/os_a32.c
+	src/osdep/unix/os_a32.h
+	src/osdep/unix/os_a41.c
+	src/osdep/unix/os_a41.h
+	src/osdep/unix/os_aix.h
+	src/osdep/unix/os_aos.h
+	src/osdep/unix/os_art.h
+	src/osdep/unix/os_asv.h
+	src/osdep/unix/os_aux.h
+	src/osdep/unix/os_bsd.h
+	src/osdep/unix/os_bsf.h
+	src/osdep/unix/os_bsi.h
+	src/osdep/unix/os_cvx.h
+	src/osdep/unix/os_cyg.h
+	src/osdep/unix/os_d-g.c
+	src/osdep/unix/os_d-g.h
+	src/osdep/unix/os_do4.h
+	src/osdep/unix/os_drs.c
+	src/osdep/unix/os_drs.h
+	src/osdep/unix/os_hpp.h
+	src/osdep/unix/os_isc.h
+	src/osdep/unix/os_lnx.h
+	src/osdep/unix/os_lyn.c
+	src/osdep/unix/os_lyn.h
+	src/osdep/unix/os_mct.c
+	src/osdep/unix/os_mct.h
+	src/osdep/unix/os_mnt.h
+	src/osdep/unix/os_nto.c
+	src/osdep/unix/os_nto.h
+	src/osdep/unix/os_os4.c
+	src/osdep/unix/os_os4.h
+	src/osdep/unix/os_osf.c
+	src/osdep/unix/os_osf.h
+	src/osdep/unix/os_osx.h
+	src/osdep/unix/os_ptx.h
+	src/osdep/unix/os_qnx.c
+	src/osdep/unix/os_qnx.h
+	src/osdep/unix/os_s40.h
+	src/osdep/unix/os_sc5.c
+	src/osdep/unix/os_sc5.h
+	src/osdep/unix/os_sco.c
+	src/osdep/unix/os_sco.h
+	src/osdep/unix/os_sgi.c
+	src/osdep/unix/os_sgi.h
+	src/osdep/unix/os_shp.h
+	src/osdep/unix/os_slx.h
+	src/osdep/unix/os_soln.h
+	src/osdep/unix/os_solo.h
+	src/osdep/unix/os_sos.c
+	src/osdep/unix/os_sos.h
+	src/osdep/unix/os_sun.h
+	src/osdep/unix/os_sv2.h
+	src/osdep/unix/os_sv4.h
+	src/osdep/unix/os_ult.h
+	src/osdep/unix/phile.c
+	src/osdep/unix/pmatch.c
+	src/osdep/unix/pseudo.c
+	src/osdep/unix/pseudo.h
+	src/osdep/unix/rename.c
+	src/osdep/unix/scandir.c
+	src/osdep/unix/setpgrp.c
+	src/osdep/unix/sig_bsd.c
+	src/osdep/unix/sig_psx.c
+	src/osdep/unix/sig_sv4.c
+	src/osdep/unix/ssl_none.c
+	src/osdep/unix/sslstdio.c
+	src/osdep/unix/strerror.c
+	src/osdep/unix/tcp_unix.h
+	src/osdep/unix/truncate.c
+	src/osdep/unix/tz_bsd.c
+	src/osdep/unix/tz_nul.c
+	src/osdep/unix/tz_sv4.c
+	src/osdep/unix/unix.h
+	src/osdep/unix/utime.c
+	src/osdep/unix/write.c
+	src/osdep/vms/build.com
+	src/osdep/vms/clean.com
+	src/osdep/vms/dummy.h
+	src/osdep/vms/dummyvms.c
+	src/osdep/vms/env_vms.c
+	src/osdep/vms/env_vms.h
+	src/osdep/vms/fs_vms.c
+	src/osdep/vms/ftl_vms.c
+	src/osdep/vms/linkage.h
+	src/osdep/vms/nl_vms.c
+	src/osdep/vms/os_vms.c
+	src/osdep/vms/pmatch.c
+	src/osdep/vms/tcp_vms.h
+	src/osdep/vms/tcp_vmsn.c
+	src/osdep/wce/drivers.bat
+	src/osdep/wce/drivraux.bat
+	src/osdep/wce/dummy.h
+	src/osdep/wce/dummywce.c
+	src/osdep/wce/env_wce.c
+	src/osdep/wce/env_wce.h
+	src/osdep/wce/fs_wce.c
+	src/osdep/wce/ftl_wce.c
+	src/osdep/wce/makefile.wce
+	src/osdep/wce/mkautaux.bat
+	src/osdep/wce/mkauths.bat
+	src/osdep/wce/nl_wce.c
+	src/osdep/wce/os_wce.c
+	src/osdep/wce/os_wce.h
+	src/osdep/wce/pmatch.c
+	src/osdep/wce/setproto.bat
+	src/osdep/wce/tcp_wce.h
+	src/tmail/Makefile
+	tools/Makefile
+	tools/ua
+	tools/uahelper.c
+Apache-2.0 [1988-2007 University of Washington]: README
+	docs/BUILD
+	docs/FAQ.html
+	docs/FAQ.txt
+	docs/SSLBUILD
+	docs/bugs.txt
+	src/ansilib/strtok.c
+	src/c-client/auth_md5.c
+	src/c-client/imap4r1.h
+	src/c-client/nntp.c
+	src/c-client/pop3.c
+	src/c-client/tcp.h
+	src/c-client/utf8aux.c
+	src/c-client/utf8aux.h
+	src/charset/widths.c
+	src/dmail/dmail.1
+	src/dmail/dmail.c
+	src/dmail/dquota.c
+	src/dmail/dquota.h
+	src/osdep/amiga/dummy.c
+	src/osdep/amiga/fdstring.c
+	src/osdep/amiga/mbx.c
+	src/osdep/amiga/mh.c
+	src/osdep/amiga/mtx.c
+	src/osdep/amiga/news.c
+	src/osdep/amiga/tenex.c
+	src/osdep/dos/fdstring.c
+	src/osdep/dos/makefile
+	src/osdep/mac/linkage.c
+	src/osdep/nt/dummynt.c
+	src/osdep/nt/fdstring.c
+	src/osdep/nt/makefile.nt
+	src/osdep/nt/makefile.ntk
+	src/osdep/nt/makefile.old
+	src/osdep/nt/makefile.w2k
+	src/osdep/nt/mbxnt.c
+	src/osdep/nt/mtxnt.c
+	src/osdep/nt/tcp_nt.c
+	src/osdep/nt/tenexnt.c
+	src/osdep/os2/mbxnt.c
+	src/osdep/os2/mtxnt.c
+	src/osdep/os2/tenexnt.c
+	src/osdep/tops-20/linkage.c
+	src/osdep/tops-20/os_t20.h
+	src/osdep/unix/Makefile
+	src/osdep/unix/Makefile.gss
+	src/osdep/unix/ckp_gss.c
+	src/osdep/unix/dummy.c
+	src/osdep/unix/fdstring.c
+	src/osdep/unix/flocksim.c
+	src/osdep/unix/mbx.c
+	src/osdep/unix/mh.c
+	src/osdep/unix/mtx.c
+	src/osdep/unix/news.c
+	src/osdep/unix/os_aix.c
+	src/osdep/unix/os_bsf.c
+	src/osdep/unix/os_bsi.c
+	src/osdep/unix/os_dyn.h
+	src/osdep/unix/os_lnx.c
+	src/osdep/unix/os_mnt.c
+	src/osdep/unix/os_nxt.c
+	src/osdep/unix/os_nxt.h
+	src/osdep/unix/os_osx.c
+	src/osdep/unix/os_pyr.h
+	src/osdep/unix/os_slx.c
+	src/osdep/unix/os_sua.c
+	src/osdep/unix/os_sua.h
+	src/osdep/unix/os_ult.c
+	src/osdep/unix/os_vu2.c
+	src/osdep/unix/tenex.c
+	src/osdep/vms/linkage.c
+	src/osdep/vms/os_vms.h
+	src/tmail/tmail.1
+	src/tmail/tmail.c
+	src/tmail/tquota.c
+	src/tmail/tquota.h
+	tools/an
+Apache-2.0 [1988-2008 University of Washington]: Makefile
+	docs/RELNOTES
+	src/c-client/env.h
+	src/c-client/mail.h
+	src/c-client/utf8.c
+	src/imapd/imapd.c
+	src/ipopd/ipop2d.c
+	src/ipopd/ipop3d.c
+	src/mailutil/mailutil.1
+	src/mailutil/mailutil.c
+	src/mlock/mlock.c
+	src/osdep/amiga/env_ami.c
+	src/osdep/amiga/mix.c
+	src/osdep/amiga/mmdf.c
+	src/osdep/amiga/mx.c
+	src/osdep/amiga/tcp_ami.c
+	src/osdep/amiga/unix.c
+	src/osdep/dos/tcp_dos.c
+	src/osdep/dos/tcp_dwa.c
+	src/osdep/dos/tcp_wsk.c
+	src/osdep/mac/tcp_mac.c
+	src/osdep/nt/env_nt.c
+	src/osdep/nt/ssl_nt.c
+	src/osdep/nt/ssl_old.c
+	src/osdep/nt/ssl_w2k.c
+	src/osdep/nt/unixnt.c
+	src/osdep/os2/tcp_os2.c
+	src/osdep/os2/unixnt.c
+	src/osdep/tops-20/shortsym.h
+	src/osdep/tops-20/tcp_t20.c
+	src/osdep/unix/env_unix.c
+	src/osdep/unix/mix.c
+	src/osdep/unix/mmdf.c
+	src/osdep/unix/mx.c
+	src/osdep/unix/ssl_unix.c
+	src/osdep/unix/tcp_unix.c
+	src/osdep/unix/unix.c
+	src/osdep/vms/tcp_vmsl.c
+	src/osdep/vms/tcp_vmsm.c
+	src/osdep/wce/tcp_wce.c
+Apache-2.0 [(((unsigned)>=060)&((unsigned)<=067)) / 1988-2007 University of Washington / (-'0')]: src/osdep/unix/os_aos.c
+	src/osdep/unix/os_bsd.c
+	src/osdep/unix/os_cvx.c
+	src/osdep/unix/os_do4.c
+	src/osdep/unix/os_dyn.c
+	src/osdep/unix/os_hpp.c
+	src/osdep/unix/os_ptx.c
+	src/osdep/unix/os_s40.c
+	src/osdep/unix/os_shp.c
+	src/osdep/unix/os_sol.c
+	src/osdep/unix/os_sun.c
+Apache-2.0 [(((unsigned)>=060)&((unsigned)<=067)) / 1988-2006 University of Washington / (-'0')]: src/osdep/unix/os_art.c
+	src/osdep/unix/os_asv.c
+	src/osdep/unix/os_aux.c
+	src/osdep/unix/os_cyg.c
+	src/osdep/unix/os_isc.c
+	src/osdep/unix/os_pyr.c
+	src/osdep/unix/os_sv2.c
+	src/osdep/unix/os_sv4.c
+	src/osdep/unix/os_vu2.h
+*No copyright* UNKNOWN []: src/osdep/mac/mtest.sit.hqx
+	src/osdep/vms/link.opt
+	src/osdep/vms/link_mnt.opt
+	src/osdep/vms/link_nlb.opt
+Apache-2.0 [1988 Stanford University / 1988-2006 University of Washington]: src/c-client/misc.c
+	src/c-client/misc.h
+	src/c-client/rfc822.h
+Apache-2.0 [1988 Stanford University / 1988-2008 University of Washington]: src/c-client/imap4r1.c
+	src/c-client/rfc822.c
+	src/c-client/smtp.c
+Apache-2.0 [1988 Stanford University / 1988-2007 University of Washington]: src/c-client/smtp.h
+	src/mtest/mtest.c
+Apache-2.0 [1988-2008 University of Washington / ((c & 0xff80) ? ((c & 0xf800) ? 3 : 2) : 1)]: src/c-client/utf8.h
+Apache-2.0 [= " 1988-2007 University of Washington\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n"; / 1988-2008 University of Washington]: src/c-client/mail.c
+Apache-2.0 [= a,b) / 1988-2007 University of Washington]: src/osdep/nt/os_nt.h
+Apache-2.0 [while (n) s[--n]: src/ansilib/memset.c
+UNKNOWN [1988 Stanford University and was developed in the / 1988-2007 by the University of Washington]: NOTICE
+UNKNOWN [owner / owner. For the purposes of this definition, "submitted" / owner as "Not a Contribution." / owner that is granting the License / owner or entity authorized by]: LICENSE.txt
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd.docs
+++ uw-imap-2007b~dfsg/debian/uw-imapd.docs
@@ -0,0 +1,2 @@
+docs/RELNOTES
+docs/bugs.txt
--- uw-imap-2007b~dfsg.orig/debian/ipopd.templates
+++ uw-imap-2007b~dfsg/debian/ipopd.templates
@@ -0,0 +1,35 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: ipopd/protocol
+Type: multiselect
+Choices: pop3, pop3s, pop2
+Default: pop3, pop3s
+_Description: Server ports and protocols to support:
+ Please choose the server ports and protocols to activate.
+ .
+  pop3:  POP 3 on TCP port 110 with TLS support;
+  pop3s: POP 3 on TCP port 995 with SSL support;
+  pop2:  (obsolete) POP 2 on TCP port 109 with TLS support.
+ .
+ It is recommended to activate both pop3 and pop3s.
+ .
+ As the ports and protocols choice may have been overridden by local
+ changes, you may need to enforce the choice and run the package
+ configuration again with 'dpkg-reconfigure ipopd'.
+
+Template: ipopd/force_debconf_choice
+Type: boolean
+Default: false
+_Description: Enforce port selection?
+ The ipopd daemon supports listening simultaneously on several ports.
+ .
+ As the ports and protocols choice may have been overridden by local
+ changes, you may need to enforce the choice and run the package
+ configuration again with 'dpkg-reconfigure ipopd'.
--- uw-imap-2007b~dfsg.orig/debian/changelog.old
+++ uw-imap-2007b~dfsg/debian/changelog.old
@@ -0,0 +1,439 @@
+uw-imap (4:2001adebian-6) unstable; urgency=high
+
+  * libc-client2001: Fix potential segmentation fault.  Thanks Hadmut Danisch.  
+    (Closes:  #128830)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun, 13 Jan 2002 14:59:36 -0500
+
+uw-imap (4:2001adebian-5) unstable; urgency=low
+
+  * mlock:  added stdlib.h include to mlock.c to avoid possible segfaults
+    on IA64 platform.  Thanks John R. Daily.  (Closes: #126622)
+  * Remove task: from control as it isn't used anymore.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 27 Dec 2001 13:48:38 -0500
+
+uw-imap (4:2001adebian-4) unstable; urgency=low
+
+  * Change location of mail spool to /var/mail as per policy.
+  * libc-client2001: Fix speeling mistake in description.
+    (Closes: #124903)
+  * The text which contained another spellink mistake doesn't exist
+    anymore.  (Closes: #125449)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 18 Dec 2001 06:20:14 -0500
+
+uw-imap (4:2001adebian-3) unstable; urgency=high
+
+  * The "Woodwards' Gripe Water" release.
+  * synchronized patches with uw-imap-ssl
+  * uw-imapd: Removed pine from Suggests as it is no longer an official
+    Debian package.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 17 Dec 2001 13:22:27 -0500
+
+uw-imap (4:2001adebian-2) unstable; urgency=low
+
+  * uw-imapd: Added imap3 service to inetd.conf for those clients that
+    need it.  See /usr/share/doc/uw-imapd/README.Debian for info on
+    turning it off if you don't need it.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 22 Nov 2001 12:57:07 -0500
+
+uw-imap (4:2001adebian-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 19 Nov 2001 02:54:15 -0500
+
+uw-imap (3:2001a.rc4debian-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 13 Nov 2001 14:34:16 -0500
+
+uw-imap (3:2001a.rc2debian-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 23 Oct 2001 23:27:23 -0400
+
+uw-imap (2:2001debian-1) unstable; urgency=low
+
+  * This is the official 2001 release
+  * No changes, just a version number change really
+  * Some lintian warnings cleaned up
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 23 Oct 2001 15:02:45 -0400
+
+uw-imap (1:2001rc1debian-1) unstable; urgency=high
+
+  * New upstream release
+  * Source reworked to use dbs.  There wasn't much in the way of
+    documentation so let me know if there were any errors with this.
+  * Brand new all-singing, all-dancing, maildir patch from Miquel Van
+    Smoorenburg.  (Closes: #111435, #105542 and hopefully the other maildir
+    bug reports.)
+  * Also a patch from Miquel for just advertising private and shared
+    namespaces.  See /usr/share/doc/libc-client2001/README.Debian for details.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 28 Sep 2001 06:14:23 -0400
+
+uw-imap (1:2001beta010722debian-4) unstable; urgency=high
+
+  * shared libs need to be linked with gcc, not ld. (Closes: #108091)
+  * for maildirs INBOX should be ~/Maildir.
+  * Most existing maildir problems should be fixed at this point.
+    (Closes: #46557, #59546, #97432, #104208) Maildir users please test
+    and if there are still issues reopen the bugs or file new ones.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 10 Aug 2001 11:32:49 -0400
+
+uw-imap (1:2001beta010722debian-3) unstable; urgency=high
+
+  * uw-imapd: Fixed wrapped lines in logcheck filter (Closes: #107726) 
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon,  6 Aug 2001 01:41:38 -0400
+
+uw-imap (1:2001beta010722debian-2) unstable; urgency=low
+
+  * libc-client2001: sysinbox() was only looking at ~/Mailbox not
+    /var/mail/$USER.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 31 Jul 2001 11:40:57 -0400
+
+uw-imap (1:2001beta010722debian-1) unstable; urgency=low
+
+  * New upstream version.  Apologies for the hideous version number.Despite
+    the 'beta' this is actually the current stable version. (Go figure.)
+  * uw-imapd: Added Task: header to control file for new tasks scheme.
+  * uw-imapd: linked imapcopy.1 to imapmove.1 (Closes: #99574)
+  * uw-imapd: You shouldn't get the message "Can't create mailbox node
+    ~/mbox: File exists." anymore (Closes: #66605, #71111)
+  * uw-imapd: New feature in this version should fix problems with Outlook,
+    Outlook Express (Closes: #73017, #80574)
+  * libc-client2001: fixed up struct SEARCHPGM member names so they work
+    in ANSI C++. (Closes: #102844)
+  * ipopd: Added a filter for logcheck (Closes #100899)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 30 Jul 2001 10:37:12 -0400
+
+uw-imap (1:2000cdebian-4) unstable; urgency=low
+
+  * libc-client2000:  Changed shared lib build method (Closes: #98649)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 24 May 2001 19:55:32 -0400
+
+uw-imap (1:2000cdebian-3) unstable; urgency=low
+
+  * uw-imapd: Added a filter for logcheck (Closes: #97742)
+  * uw-imapd,ipopd: Now we just update inetd entries not remove and then
+    readd them (Closes: #98444)
+  * 
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 24 May 2001 00:08:31 -0400
+
+uw-imap (1:2000cdebian-2) unstable; urgency=low
+
+  * I've not had time to do all the work on this package that I want to
+    but I thought I'd at least fix some of the easier bugs in the
+    meantime.
+  * libc-client2000-dev: conflicts with libc-client4.7-dev (closes: #81527)
+  * libc-client2000:  Hopefully fixed, . and .. showing up as mail in
+    maildirs
+  * New maildir patch from http://greboguru.org/qmail/
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue,  8 May 2001 10:02:49 -0400
+
+uw-imap (1:2000cdebian-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon, 12 Feb 2001 23:44:51 -0500
+
+uw-imap (1:2000bdebian-1) unstable; urgency=low
+
+  * New upstream release
+  * Corrected wrong paths in man pages (Closes: #81598)
+  * libc-client2000-dev:  Added dependency on libpam0g-dev (Closes:  #78765)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun, 21 Jan 2001 01:15:31 -0500
+
+uw-imap (2000debian-2) unstable; urgency=low
+
+  * Fixed bad dependency for libc-client2000-dev
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed, 15 Nov 2000 08:57:27 -0500
+
+uw-imap (2000debian-1) unstable; urgency=low
+
+  * New Upstream version.
+  * Package name has changed.
+  * corrupted mailbox problem fixed upstream.  (Closes: #70647, #70608)
+  * Fixed inability to recognize charsets with long names (Closes: #67864)
+  * Fixed inaccurate ipop[23]d man page. (Closes: #76642)
+  * Does not have spurious dependency on ldso now (Closes: #76228)
+  * maildir driver no longer complains if maildir begins with a dot.
+    (Closes: #69746)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun, 12 Nov 2000 02:09:16 -0500
+
+imap (4.7c-2) unstable; urgency=high
+ 
+  * problem with MD5 passwords made clearer.  (Thanks Craig Small)
+    (Closes: #64149)
+  * libc-client4.7:  Maybe fix buffer overflow that could corrupt
+    mailboxes.  We still need to test this.
+ 
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri,  1 Sep 2000 16:15:53 -0400
+
+imap (4.7c-1) frozen unstable; urgency=high
+
+  * New upstream patch release.
+  * SECURITY: addresses buffer overflow problems mentioned on BugTraq
+  * mlock: saner permissions on /usr/bin/mlock. (Closes: #58791, #59527)
+  * Some fixes to documentation of how to compile for slink.  It should
+    work correctly now. (Thanks to Christian Worm Mortensen for his
+    assistance with this.)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 27 Oct 2000 00:50:03 -0400
+
+imap (4.7b-1) unstable; urgency=low
+
+  * New upstream patch release.  No new features.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sat, 22 Apr 2000 00:40:41 -0500
+
+imap (4.7a-1) unstable; urgency=low
+
+  * upstream  patch release which corrects crashes caused by certain
+    unusual tokens in message headers.  There are no new features.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri,  3 Mar 2000 10:19:51 -0500
+
+imap (4.7-7) frozen unstable; urgency=high
+
+  * libc-client4.7: incorrect dependency for PAM which could affect people
+    upgading from slink corrected.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sat, 15 Jan 2000 15:28:41 -0500
+
+imap (4.7-6) unstable; urgency=high
+
+  * libc-client4.7-dev: symlinked /usr/lib/c-client.a to
+    /usr/lib/libc-client.a (Closes: #54647)
+  * mlock: changed to priority optional like the rest of
+    the packages(Closes: #53508)
+  * Debut of my new GPG key.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 11 Jan 2000 22:37:44 -0500
+
+imap (4.7-5) unstable; urgency=high
+
+  * mlock:  Oops messed up the conflicts.  Fixed for real this time.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun,  2 Jan 2000 08:40:36 -0500
+
+imap (4.7-4) unstable; urgency=high
+
+  * mlock: added conflicts to older versions of libc-client so there are
+    no overwrite problems.  (Closes: #53727)
+  * mlock: wrote a man page so there is at least *some* documentation as
+    to what the heck it does.  (Closes: #53509)
+  * libc-client4.7:  More documentation added to package. (Closes: #53369)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 31 Dec 1999 16:19:36 -0500
+
+imap (4.7-3) unstable; urgency=high
+
+  * Documentation about MD5 authentication made much clearer so people can
+    understand why their IMAP server suddenly doesn't seem to authenticate
+    any more.  (Closes:  #50319, #51923, #53189, #53190)
+  * mlock spun out into it's own package which libc-client4.7 depends on.
+    This will allow multiple versions of libc-client to be installed.
+    (Closes: #52975)
+  * Correct build dependencies. (Closes: #52296)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 23 Dec 1999 17:49:42 -0500
+
+imap (4.7-2) unstable; urgency=low
+
+  * Fixed broken source dependencies (Closes: #51710)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed,  1 Dec 1999 15:12:41 -0500
+
+imap (4.7-1) unstable; urgency=low
+
+  * New upstream version
+  * changed name of package libc-client-dev to libc-client4.7-dev
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sat, 20 Nov 1999 01:23:44 -0500
+
+imap (4.6-4) unstable; urgency=low
+
+  * imap: dmail can now deliver mail to symlinked mailboxes (Closes: #49552)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon,  8 Nov 1999 18:46:54 -0500
+
+imap (4.6-3) unstable; urgency=low
+
+  * libc-client4.6: /etc/cram-md5.pwd is no longer a conffile and not
+    included in the package.  Thus md5 authentication is no longer the default.
+    Read the docs to find out how to enable this.  (Closes:  #48800)
+  * ipopd: corrected name of PAM configuration file (Closes: #48935)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon,  1 Nov 1999 19:18:21 -0500
+
+imap (4.6-2) unstable; urgency=low
+
+  * libc-client-dev:  Added linkage.c which is needed to compile pine
+  * libc-client4.6 Removed bogus -lpam link flag from slx target in Makefile.
+    This was preventing compilation under slink. 
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 29 Oct 1999 18:44:43 -0400
+
+imap (4.6-1) unstable; urgency=low
+
+  * New upstream version (Closes: #48319)
+  * Includes imap-utils (Closes: #47969)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed, 27 Oct 1999 20:22:23 -0400
+
+imap (4.5-8) unstable; urgency=low
+
+  * all: WARNING: mailbox root has been changed back to $HOME again.  It
+    is no longer $HOME/mail. Please carefully reviw your setup to see if
+     this will affect you in any way.  See README.Debian for additional info.
+    (closes: #33780, #34056, #41731, #43171, #44781, #45624)
+  * imap: postrm specifically removes imapd from inet.conf not just 
+    anything that happens to have the imap port.  (closes: #42786)
+  * libc-client4.5:  Added David Harrises patches for maildir support so
+    you can properly delete maildir folders.  (Closes: #44607) Thanks
+    to Jens Jorgensen.
+  * libc-client4.5: patched the maildir patch to also look for folders in
+    /var/spool/mail/username.  (closes: #47201) Thanks to Miquel Van
+    Smoorenburg for the patch.
+  * Ok, really fix non-PIC code in shared lib this time (closes: #42390)
+    Thanks to Madarasz Gergely for the patch.
+  * Based on suggestion by Mike Bilow, added the ability to compile under
+    slink which previously could not be done due to differences in
+    libraries etc.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed, 20 Oct 1999 20:55:57 -0400
+
+imap (4.5-7) unstable; urgency=low
+
+  * libc-client4.5: compiled with MD5 support.  This means both imapd and 
+    ipop[23]d have MD5 support and ipop[23]d can do APOP.  
+    (fixes: #41213, 41214)
+  * ipopd: provides and conflicts with virtual package pop3-server 
+    (fixes: #38523, #42410)
+  * libc-client-dev: library no longer contains PIC code (fixes: #42390)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon,  9 Aug 1999 23:33:46 -0400
+
+imap (4.5-6) unstable; urgency=low
+
+  * made a c-client shared library (Thanks to Madarasz Gergely for the
+    patch) the c-client packages have been renamed to libc-client4.5 and
+    libc-client4.5-dev to be more in line with Debian conventions. 
+    (closes #48033)
+  * Added new maildir patch (Thanks Chris Bond) which should hopefully fix
+    some of the remaining problems.  (closes #39375)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu,  8 Jul 1999 01:16:59 -0400
+
+imap (4.5-5) unstable; urgency=low
+
+  * Reworded parts of imaps README.Debian.  Thanks to Brock Rozen. 
+    (closes #38840)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Thu, 10 Jun 1999 13:16:08 -0400
+
+imap (4.5-4) unstable; urgency=low
+
+  * Die! folder creation bug die!
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed,  9 Jun 1999 17:04:08 -0400
+
+imap (4.5-3) unstable; urgency=low
+
+  * Readded maildir support 
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed,  9 Jun 1999 06:53:29 -0400
+
+imap (4.5-2) unstable; urgency=low
+
+  * A dumb typo on my part meant that 4.5-1 looked in $HOME for folders 
+    instead of $HOME/mail.  This has been put right (fixes #39094, #39138)
+    This should also Fix the problems people are having creating folders.
+    (fixes #39010)
+  * Backed out old maildir patch.  It seemed to be causing more problems
+    than it solved.  (fixes #39017) I have received a new one from Chris
+    Bond but owing to the SNAFU I have described above, I just want to
+    get this release out quickly.  maildir  will be back in -3 I promise :-)
+  * Added PAM configuration file for ipopd (fixes #38787)
+  * Added old entries back to debian/changelog (fixes #38871)
+  * Uses pristine source (fixes #38870)
+  * You shouldn't get the mailbox vulnerable error anymore.  It wasn't
+    valid for Debian anyway.  (fixes #36108)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue,  8 Jun 1999 15:24:40 -0400
+
+imap (4.5-1) unstable; urgency=low
+
+  * Upload of latest stable upstream version (fixes #38355).  I had hoped
+    to fix some of the outstanding bugs but I haven't yet and people are
+    getting restless so I thought I'd better get this out quickly.
+  * New upstream version
+  * Contains fix for potential security problems in ipop2d
+  * Now has maildir support (closes #33373). Thanks to Marcelo Magallon
+  * Now has PAM support.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Wed,  26 May 1999 20:41:29 -0400
+
+imap (4.4-5) unstable; urgency=low
+
+  * Added some documentation to the c-client-dev package (fixes #30619)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri, 18 Dec 1998 11:01:52 -0500
+
+imap (4.4-4) unstable; urgency=low
+
+  * Missing some extra header files in c-client-dev
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue,  6 Oct 1998 14:42:25 -0400
+
+imap (4.4-3) unstable; urgency=low
+
+  * Included instructions for changing the mailbox root directory in
+    README.Debian and included instructions for imaprc.  (fixes #27241)
+  * Seperated out c-client.a and its headers into a seperate
+    c-client-dev package.  There will be a shared libc-client.so at
+    some point but not yet.
+  * Cleaned up remnants of former typos indebian directory
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue,  6 Oct 1998 03:52:56 -0400
+
+imap (4.4-2) unstable; urgency=low
+
+  * Didn't realize multiple binary packages don't need their own
+    changelogs. changelog for ipopd is gone now.  (fixes #23786)
+  * ipopd now conflicts with older version of imap that contained the
+    ipop[23]d binaries so dpkg won't complain about overwrites.
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Mon,  5 Oct 1998 03:10:58 -0400
+
+imap (4.4-1) unstable; urgency=low
+
+  * New upstream version
+  * added define of _XOPEN_SOURCE and _BSD_SOURCE for crypt() prototype
+    (fixes #26130)
+  * uses $HOME/mail as mailbox root instead of $HOME (fixes #26185)
+  * finally got around to fixing ipopd and rimap references in imapd man
+    page.  (fixes #17812 at last!)
+  * ipop2d and ipop3d split out into their own package
+  * A little more in the way of documentation
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Sun, 27 Sep 1998 22:40:45 -0400
+
--- uw-imap-2007b~dfsg.orig/debian/NEWS.in
+++ uw-imap-2007b~dfsg/debian/NEWS.in
@@ -0,0 +1,32 @@
+uw-imap (7:2004g.debian1-1) unstable; urgency=low
+
+  * Maildir is back! According to documentation this should be a more
+    flexible and well supported implementation. Let's see if it is true!
+    Beware, however, that it is still an unofficial patch - it is not
+    supported upstream. Bugfixes are welcome, but problems reported
+    without fixes will only lead to the Maildir support being dropped
+    again.
+    In other words: Maildir is EXPERIMENTAL - use at your own risk!
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 11 Oct 2005 23:09:28 +0200
+
+uw-imap (7:2002ddebian1-1) unstable; urgency=low
+
+  * Drop Maildir patch. The code has always been buggy, is unsupported
+    upstream and hasn't been maintained for several years. In addition,
+    it may be the cause of security issues.
+    The code and texts related to Maildir is kept in the source package
+    for those interested in recompiling locally, but is no longer
+    officially supported by Debian.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 31 May 2003 17:51:35 +0200
+
+uw-imap (4:2002rc7debian-1) unstable; urgency=low
+
+  * New upstream version.  SSL/TLS functionality is now built in so the
+    old -ssl packages are obsolete.
+  * WARNING: plaintext logins have been disabled for non SSL/TLS
+    connections.  See /usr/share/doc/libc-client__VER__/README.Debian for
+    further information. (Closes: #164454)
+
+ -- Jaldhar H. Vyas <jaldhar@debian.org>  Tue, 15 Oct 2002 14:01:34 -0400
--- uw-imap-2007b~dfsg.orig/debian/__PKG__.postinst._in
+++ uw-imap-2007b~dfsg/debian/__PKG__.postinst._in
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+set -e
+
+inetgroup="mail"	# inetd group
+pkg="__PKG__"	# basename of package
+cert="__CERT__"	# basename of certificate
+description="__DESC__"	# descriptive text
+daemonsets="__DAEMONSETS__"	# space-seperated list of colon-seperated list of port and binary name (or path if not /usr/sbin)
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+db_get "$pkg/force_debconf_choice"
+debconf_enforce="$RET"
+
+inetd_do_service() {
+	case "$INETD_ACTION" in
+	    add)
+		update-inetd --group "$inetgroup" --add "$1\tstream\ttcp\tnowait\troot\t/usr/sbin/tcpd $2"
+		;;
+	    enable)
+		update-inetd --enable "$1"
+		;;
+	    *)
+		echo "ERROR: Unknown inetd action \"$INETD_ACTION\" while doing service \"$1\"" >/dev/stderr
+		exit 1
+	esac
+}
+
+if [ "$1" = "configure" ]; then
+	if [ -z "$2" ]; then
+		INETD_ACTION="add"
+	else
+		if [ "$debconf_enforce" = "true" ]; then
+			INETD_ACTION="add"
+		else
+			INETD_ACTION="enable"
+		fi
+
+		# Bug#295306
+		if dpkg --compare-versions "$2" le 7:2002edebian1-6; then
+			cachefile=/var/cache/${pkg}_inetd.conf_copy
+			if [ -r "$cachefile" ]; then
+				while read line; do
+					update-inetd --group "$inetgroup" --add "$line"
+				done < "$cachefile"
+				rm -f "$cachefile"
+			else
+				# The file has disappeared, or we're installing from
+				# 'config files' state. Install default entries.
+				INETD_ACTION="add"
+			fi
+		fi
+	fi
+
+	db_get "$pkg/protocol"
+	debconf_entries="`echo "$RET" | tr ',' ' '`"
+	for daemonset in $daemonsets; do
+		seen=""
+		service="`echo "$daemonset" | awk -F: '{ print $1 }'`"
+		binary="`echo "$daemonset" | awk -F: '{ print $2 }' | sed 's,^\([^/]\),/usr/sbin/\1,'`"
+		for debconf_entry in $debconf_entries; do
+			if [ "$debconf_entry" = "$service" ]; then
+				inetd_do_service "$service" "$binary"
+				seen="yes"
+				break
+			fi
+		done
+		if [ "$seen" != "yes" ]; then
+			if [ "$debconf_enforce" = "true" ]; then
+				update-inetd --disable "$service"
+			else
+				echo "WARNING: Port \"$service\" unselected in debconf but possibly handled locally." >/dev/stderr
+			fi
+		fi
+	done
+fi
+
+cd /etc/ssl/certs
+PATH=$PATH:/usr/bin/ssl
+if [ -f "$cert.pem" ]; then
+	echo "You already have /etc/ssl/certs/$cert.pem"
+else
+	echo "Creating generic self-signed certificate: /etc/ssl/certs/$cert.pem"
+	echo "(replace with hand-crafted or authorized one if needed)."
+	HOSTNAME=`hostname -s`
+	FQDN=`hostname -f`
+	MAILNAME=`cat /etc/mailname 2> /dev/null || hostname -f`
+	openssl req -new -x509 -days 365 -nodes -out "$cert.pem" -keyout "$cert.pem" > /dev/null 2>&1 <<+
+.
+.
+.
+$description
+$HOSTNAME
+$FQDN
+root@$MAILNAME
++
+	ln -sf "$cert.pem" `openssl x509 -noout -hash < "$cert.pem"`.0
+	chown root:root "/etc/ssl/certs/$cert.pem"
+	chmod 0640 "/etc/ssl/certs/$cert.pem"
+fi
+ 
+#DEBHELPER#
+
+exit 0
--- uw-imap-2007b~dfsg.orig/debian/compat
+++ uw-imap-2007b~dfsg/debian/compat
@@ -0,0 +1 @@
+5
--- uw-imap-2007b~dfsg.orig/debian/uw-mailutils.install
+++ uw-imap-2007b~dfsg/debian/uw-mailutils.install
@@ -0,0 +1,3 @@
+dmail/dmail			/usr/bin
+tmail/tmail			/usr/bin
+mailutil/mailutil		/usr/bin
--- uw-imap-2007b~dfsg.orig/debian/ipopd.README.debian.in
+++ uw-imap-2007b~dfsg/debian/ipopd.README.debian.in
@@ -0,0 +1,50 @@
+UW IMAP IPOPD __VER__ FOR DEBIAN
+================================
+
+[Note: ipopd uses the c-client library for most of the actual work of
+handling mail.  So you should read the documentation in
+/usr/share/doc/libc-client__VER__/ too.]
+
+
+SSL support
+===========
+
+This package has been compiled with SSL support.  On installation it will
+generate a self-signed certificate for you in /etc/ssl/certs/ipop3d.pem.
+(POP2 over SSL is not supported.) It will expire in one year.  You can
+replace this with a certificate from verisign etc. if you want. Or you can
+follow the instructions in the openssl package to generate your own.
+
+
+Authentication
+==============
+
+This package uses PAM for authentication.  The configuration file is 
+/etc/pam.d/pop
+
+It has also been compiled with CRAM-MD5 SASL and APOP support.  
+See /usr/share/doc/libc-client__VER__/md5.txt for additional information.
+NOTE:  If your users seem to have problems logging in, this is the first
+thing to check.
+
+It also has Kerberos support via GSSAPI.  Here's how to enable it.
+
+  * Create pop3/hostname@REALM keytab using kadmin.local
+  * add the resulting key to /etc/krb5.conf on the pop server
+  * Make sure that libsasl-gssapi-mit is installed on the clients
+  * get Kerberos tickets
+
+(thanks Sam Hartman)
+
+
+POP2 and encryption
+===================
+
+As mentioned in /usr/share/doc/libc-client__VER__/README.Debian, c-client now
+disallows plaintext logins by default.  However POP2 has no provision for
+SSL/TLS encryption so if you need POP2 (in addition to POP3), you have to
+enable plaintext logins.
+
+ 
+Jaldhar H. Vyas <jaldhar@debian.org>, Fri, 13 Dec 2002 10:21:00 -0500
+Updates: Jonas Smedegaard <dr@jones.dk>  Sat, 15 Mar 2003 21:10:00 +0100
--- uw-imap-2007b~dfsg.orig/debian/mlock.install
+++ uw-imap-2007b~dfsg/debian/mlock.install
@@ -0,0 +1 @@
+mlock/mlock		usr/bin/
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd.logcheck.ignore.server
+++ uw-imap-2007b~dfsg/debian/uw-imapd.logcheck.ignore.server
@@ -0,0 +1,5 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd\[[0-9]+\]: (Broken pipe|Command stream end of file|Connection (reset by peer|timed out)|No route to host|Transport endpoint is not connected)(,)? while (reading (authentication|line|literal|char)|writing text) (user=[^[:space:]]+ )?host=(([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd\[[0-9]+\]: (connect|(port (143|220)|imap(s SSL)?) service init) from [^[:space:]]+( \([\.0-9]+\))?$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd\[[0-9]+\]: Killed \(lost mailbox lock\) user=[^[:space:]]+ host=(([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd\[[0-9]+\]: (Login|Auth|(A|Prea)uthenticated|Logout|Autologout) user=[^[:space:]]+ host=(([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)( nmsgs=[/0-9]+( ndele=[0-9]+)?)?$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd\[[0-9]+\]: Moved [0-9]+ bytes of new mail to [^[:space:]]+ from [^[:space:]]+ host= (([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)$
--- uw-imap-2007b~dfsg.orig/debian/README.build
+++ uw-imap-2007b~dfsg/debian/README.build
@@ -0,0 +1,11 @@
+Notes on the package build environment for UW-imap
+==================================================
+
+Special filenames
+-----------------
+
+*.in:	Master files for replacing - in both filename and content - info
+	that is static for each build (like version number).
+
+*._in:	Like *.in but handled later in the build process to include info
+	that is static for each package (like package name).
--- uw-imap-2007b~dfsg.orig/debian/uw-mailutils.logcheck.ignore.server
+++ uw-imap-2007b~dfsg/debian/uw-mailutils.logcheck.ignore.server
@@ -0,0 +1,2 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dmail\[[0-9]+\]: (delivering|delivered|Verifying safe delivery) to [.#/:+[:alnum:]-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dmail\[[0-9]+\]: [[:alnum:]]+ appending to [.#/:+[:alnum:]-]+ \(file [./:+[:alnum:]-]+\)$
--- uw-imap-2007b~dfsg.orig/debian/libc-client-dev.substvars
+++ uw-imap-2007b~dfsg/debian/libc-client-dev.substvars
@@ -0,0 +1 @@
+devlibs:Depends=comerr-dev, libc6-dev, libkrb5-dev, libpam0g-dev, libssl-dev
--- uw-imap-2007b~dfsg.orig/debian/ipopd-ssl.README.debian
+++ uw-imap-2007b~dfsg/debian/ipopd-ssl.README.debian
@@ -0,0 +1,3 @@
+Now that the ipopd package supports SSL, this package is obsolete.  It is
+being provided solely as a way to seamlessly upgrade to ipopd.  Once ipopd
+is installed, you can purge it.
--- uw-imap-2007b~dfsg.orig/debian/ipopd.links
+++ uw-imap-2007b~dfsg/debian/ipopd.links
@@ -0,0 +1,2 @@
+usr/share/man/man8/ipopd.8.gz	usr/share/man/man8/ipop2d.8.gz
+usr/share/man/man8/ipopd.8.gz	usr/share/man/man8/ipop3d.8.gz
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd.README.debian.in
+++ uw-imap-2007b~dfsg/debian/uw-imapd.README.debian.in
@@ -0,0 +1,41 @@
+UW IMAP IPMAPD __VER__ FOR DEBIAN
+=================================
+
+[Note: imap uses the c-client library for most of the actual work of
+handling mail.  So you should read the documentation in
+/usr/share/doc/libc-client__VER__/ too.]
+
+
+SSL/TLS support
+===============
+
+This package has been compiled with SSL support.  On installation it will
+generate a self-signed certificate for you in /etc/ssl/certs/imapd.pem.  
+This certificate will expire in one year. You can replace this with a
+cerificate from verisign etc. if you want.  Or you can follow the instructions 
+in the openssl package to generate your own.
+
+
+Authentication
+==============
+
+This package uses PAM for authentication.  The configuration file is 
+/etc/pam.d/imap
+
+It has also been compiled with CRAM-MD5 SASL support.
+See /usr/share/doc/libc-client__VER__/md5.txt for additional information.
+NOTE:  If your users seem to have problems logging in, this is the first
+thing to check.
+
+It also has Kerberos support via GSSAPI.  Here's how to enable it.
+
+  * Create imap/hostname@REALM keytab using kadmin.local
+  * add the resulting key to /etc/krb5.conf on the imap server
+  * Make sure that libsasl-gssapi-mit is installed on the clients
+  * get Kerberos tickets
+
+(thanks Sam Hartman)
+
+
+Jaldhar H. Vyas <jaldhar@debian.org>, Sun, 20 Oct 2002 23:57:00 -0500
+Updates: Jonas Smedegaard <dr@jones.dk>  Sat, 15 Mar 2003 21:10:00 +0100
--- uw-imap-2007b~dfsg.orig/debian/control.in
+++ uw-imap-2007b~dfsg/debian/control.in
@@ -0,0 +1,119 @@
+Source: uw-imap
+Priority: optional
+Section: mail
+Maintainer: Jonas Smedegaard <dr@jones.dk>
+Standards-Version: 3.7.3
+Build-Depends: @cdbs@
+Vcs-Git: git://git.debian.org/git/collab-maint/uw-imap.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/uw-imap.git;a=summary
+Homepage: http://www.washington.edu/imap/
+
+Package: uw-imapd
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openssl, libpam-runtime (>= 0.76-13.1), openbsd-inetd | inet-superserver
+Recommends: exim4 | mail-transport-agent
+Suggests: mutt | imap-client, logcheck
+Provides: imap-server
+Conflicts: imap-server
+Description: remote mail folder access server using IMAP4rev1
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains imapd, an IMAP4rev1 server daemon which uses the
+ c-client library.
+
+Package: ipopd
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openssl, libpam-runtime (>= 0.76-13.1), openbsd-inetd | inet-superserver
+Recommends: exim4 | mail-transport-agent
+Conflicts: pop3-server
+Provides: pop3-server
+Suggests: logcheck
+Description: POP2 and POP3 mail server
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains ipopd, a POP2 and POP3 server daemon which uses
+ the c-client library.
+
+Package: libc-client2007b-dev
+Section: libdevel
+Architecture: any
+Depends: libc-client2007b (= ${binary:Version}), ${devlibs:Depends}
+Conflicts: libc-client-dev
+Replaces: libc-client-dev
+Provides: libc-client-dev
+Description: c-client library for mail protocols - development files
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains the static c-client library and development
+ headers.
+
+Package: libc-client2007b
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-modules, mlock
+Suggests: uw-mailutils
+Description: c-client library for mail protocols - library files
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains the shared c-client library.
+
+Package: mlock
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: mailbox locking program
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains a program to lock mailbox files to avoid
+ corruption.
+
+Package: uw-mailutils
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: c-client support programs
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains helper tools for the libc-client library:
+  - mailutil: utility program which helps manage email mailboxes (both
+              local and IMAP/POP3/NNTP);
+  - dmail:    MDA (Mail Delivery Agent) for use with procmail;
+  - tmail:    MDA for use with the system mailer (such as Sendmail or Postfix).
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd.manpages
+++ uw-imap-2007b~dfsg/debian/uw-imapd.manpages
@@ -0,0 +1 @@
+src/imapd/imapd.8
--- uw-imap-2007b~dfsg.orig/debian/__PKG__.preinst._in
+++ uw-imap-2007b~dfsg/debian/__PKG__.preinst._in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+pkg="__PKG__"	# basename of package
+daemonsets="__DAEMONSETS__"	# space-seperated list of colon-seperated list of port and binary name (or path if not /usr/sbin)
+
+cachefile=/var/cache/${pkg}_inetd.conf_copy
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" le 7:2002edebian1-6; then
+	# See Bug#295306: the postrm that will be called after unpacking
+	# will remove entries from /etc/inetd.conf, so we save them for
+	# restoring them in the postinst.
+	rm -f "$cachefile"
+	for daemonset in $daemonsets; do
+		service="`echo "$daemonset" | awk -F: '{ print $1 }'`"
+		binary="`echo "$daemonset" | awk -F: '{ print $2 }' | sed 's,^\([^/]\),/usr/sbin/\1,'`"
+		egrep "^([#]|#<off>)#[:space:]+?$service[:space:]" /etc/inetd.conf >>"$cachefile" || [ $? -lt 2 ] # catch grep failures
+	done
+fi
--- uw-imap-2007b~dfsg.orig/debian/__PKG__.config._in
+++ uw-imap-2007b~dfsg/debian/__PKG__.config._in
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+db_input medium __PKG__/protocol || true
+db_go || true
+
+db_input medium __PKG__/force_debconf_choice || true
+db_go || true
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd.lintian-overrides
+++ uw-imap-2007b~dfsg/debian/uw-imapd.lintian-overrides
@@ -0,0 +1 @@
+uw-imapd: setgid-binary usr/sbin/imapd 2755 root/mail
--- uw-imap-2007b~dfsg.orig/debian/libc-client__VER__-dev.docs.in
+++ uw-imap-2007b~dfsg/debian/libc-client__VER__-dev.docs.in
@@ -0,0 +1,2 @@
+docs/internal.txt
+docs/locking.txt
--- uw-imap-2007b~dfsg.orig/debian/libc-client__VER__-dev.README.debian
+++ uw-imap-2007b~dfsg/debian/libc-client__VER__-dev.README.debian
@@ -0,0 +1,18 @@
+UW IMAP C-CLIENT FOR DEBIAN, DEVELOPERS NOTES
+=============================================
+
+
+GNU C++ (G++)
+=============
+
+In the C-Client code is defined "and", "or" and "not", which clashes
+with reserved words in c++.
+
+Until recently this was solved in Debian by patching the source to use
+other names, but upstream now recommends using the g++ compile option
+"-fno-operator-names" instead. I must admit that I do not understand the
+issues involved - please get in touch with me if the former patch is
+still needed.
+
+
+Jonas Smedegaard <dr@jones.dk>  Fri, 26 Sep 2003 10:55:14 +0200
--- uw-imap-2007b~dfsg.orig/debian/README.source.in
+++ uw-imap-2007b~dfsg/debian/README.source.in
@@ -0,0 +1,14 @@
+NB! This file is a draft - it does not yet comply to Debian Policy 3.8!
+
+Upstream *.tar.Z archive has been uncompressed and compressed using GNU
+Gzip to meet Debian packaging requirements.
+
+Upstream source has been repackaged to not include the following files:
+	docs/rfc (not DFSG-free)
+	docs/draft (not DFSG-free)
+	src/osdep/mac/mtest.sit.hqx (binary code)
+
+Included is a patch to support Maildir-style storage, originally written
+by Eduardo Chappa <chappa@math.washington.edu> and published at
+http://staff.washington.edu/chappa/pine/ (read
+/usr/share/doc/libc-client__VER__/README.Maildir.gz for more info).
--- uw-imap-2007b~dfsg.orig/debian/patches/README
+++ uw-imap-2007b~dfsg/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
--- uw-imap-2007b~dfsg.orig/debian/patches/2010_disallow_escaping_home.patch
+++ uw-imap-2007b~dfsg/debian/patches/2010_disallow_escaping_home.patch
@@ -0,0 +1,12 @@
+diff -ruN uw-imap-2006b.dfsg.orig/src/osdep/unix/env_unix.c uw-imap-2006b.dfsg/src/osdep/unix/env_unix.c
+--- uw-imap-2006b.dfsg.orig/src/osdep/unix/env_unix.c	2006-10-09 18:48:56.000000000 +0200
++++ uw-imap-2006b.dfsg/src/osdep/unix/env_unix.c	2006-10-09 19:23:13.000000000 +0200
+@@ -77,7 +77,7 @@
+ static short anonymous = NIL;	/* is anonymous */
+ static short blackBox = NIL;	/* is a black box */
+ static short closedBox = NIL;	/* is a closed box (uses chroot() jail) */
+-static short restrictBox = NIL;	/* is a restricted box */
++static short restrictBox = -1;	/* is a restricted box */
+ static short has_no_life = NIL;	/* is a cretin with no life */
+ 				/* block environment init */
+ static short block_env_init = NIL;
--- uw-imap-2007b~dfsg.orig/debian/patches/0002_no_close_quit_netstream.patch
+++ uw-imap-2007b~dfsg/debian/patches/0002_no_close_quit_netstream.patch
@@ -0,0 +1,13 @@
+diff --git a/src/c-client/smtp.c b/src/c-client/smtp.c
+--- a/src/c-client/smtp.c
++++ b/src/c-client/smtp.c
+@@ -396,7 +396,8 @@ SENDSTREAM *smtp_close (SENDSTREAM *stream)
+   if (stream) {			/* send "QUIT" */
+     if (stream->netstream) {	/* do close actions if have netstream */
+       smtp_send (stream,"QUIT",NIL);
+-      net_close (stream->netstream);
++      if (stream->netstream)	/* could have been closed during "QUIT" */
++        net_close (stream->netstream);
+     }
+ 				/* clean up */
+     if (stream->host) fs_give ((void **) &stream->host);
--- uw-imap-2007b~dfsg.orig/debian/patches/2004_no_binaries_below_etc.patch
+++ uw-imap-2007b~dfsg/debian/patches/2004_no_binaries_below_etc.patch
@@ -0,0 +1,54 @@
+diff -ruN uw-imap-2006b.dfsg.orig/src/imapd/imapd.8 uw-imap-2006b.dfsg/src/imapd/imapd.8
+--- uw-imap-2006b.dfsg.orig/src/imapd/imapd.8	2006-10-09 18:48:56.000000000 +0200
++++ uw-imap-2006b.dfsg/src/imapd/imapd.8	2006-10-09 19:22:42.000000000 +0200
+@@ -16,7 +16,7 @@
+ .SH NAME
+ IMAPd \- Internet Message Access Protocol server
+ .SH SYNOPSIS
+-.B /usr/etc/imapd
++.B /usr/sbin/imapd
+ .SH DESCRIPTION
+ .I imapd
+ is a server which supports the
+@@ -42,7 +42,7 @@
+ by many Unix-based clients.  To do this, the
+ .I imapd
+ binary must have a link to
+-.I /etc/rimapd
++.I /usr/sbin/rimapd
+ since this is where this software expects it to be located.
+ .SH "SEE ALSO"
+ rsh(1) ipopd(8)
+diff -ruN uw-imap-2006b.dfsg.orig/src/ipopd/ipopd.8 uw-imap-2006b.dfsg/src/ipopd/ipopd.8
+--- uw-imap-2006b.dfsg.orig/src/ipopd/ipopd.8	2006-10-09 18:48:56.000000000 +0200
++++ uw-imap-2006b.dfsg/src/ipopd/ipopd.8	2006-10-09 19:22:42.000000000 +0200
+@@ -16,9 +16,9 @@
+ .SH NAME
+ IPOPd \- Post Office Protocol server
+ .SH SYNOPSIS
+-.B /usr/etc/ipop2d
++.B /usr/sbin/ipop2d
+ .PP
+-.B /usr/etc/ipop3d
++.B /usr/sbin/ipop3d
+ .SH DESCRIPTION
+ .I ipop2d
+ and
+diff -ruN uw-imap-2006b.dfsg.orig/src/osdep/unix/tcp_unix.c uw-imap-2006b.dfsg/src/osdep/unix/tcp_unix.c
+--- uw-imap-2006b.dfsg.orig/src/osdep/unix/tcp_unix.c	2006-10-09 18:48:56.000000000 +0200
++++ uw-imap-2006b.dfsg/src/osdep/unix/tcp_unix.c	2006-10-09 19:22:42.000000000 +0200
+@@ -346,12 +346,12 @@
+ 				/* return immediately if ssh disabled */
+     if (!(sshpath && (ti = sshtimeout))) return NIL;
+ 				/* ssh command prototype defined yet? */
+-    if (!sshcommand) sshcommand = cpystr ("%s %s -l %s exec /etc/r%sd");
++    if (!sshcommand) sshcommand = cpystr ("%s %s -l %s exec /usr/sbin/r%sd");
+   }
+ 				/* want rsh? */
+   else if (rshpath && (ti = rshtimeout)) {
+ 				/* rsh command prototype defined yet? */
+-    if (!rshcommand) rshcommand = cpystr ("%s %s -l %s exec /etc/r%sd");
++    if (!rshcommand) rshcommand = cpystr ("%s %s -l %s exec /usr/sbin/r%sd");
+   }
+   else return NIL;		/* rsh disabled */
+ 				/* look like domain literal? */
--- uw-imap-2007b~dfsg.orig/debian/patches/1001_shlibs.patch
+++ uw-imap-2007b~dfsg/debian/patches/1001_shlibs.patch
@@ -0,0 +1,232 @@
+diff -ruN uw-imap-2006k~dfsg.orig/Makefile uw-imap-2006k~dfsg/Makefile
+--- uw-imap-2006k~dfsg.orig/Makefile	2007-11-08 00:16:50.000000000 +0100
++++ uw-imap-2006k~dfsg/Makefile	2007-12-10 15:58:39.000000000 +0100
+@@ -78,11 +78,13 @@
+ # hxd	HP-UX 10.x with DCE security (see shp)
+ # isc	Interactive Systems
+ # ldb	Debian Linux
++# ldbs	Debian Linux (Shared c-client lib)
+ # lfd	Fedora Core 4
+ # ln8	Linux for Nokia N800
+ # lnx	Linux with traditional passwords and crypt() in the C library
+ #	 (see lnp, sl4, sl5, and slx)
+ # lnp	Linux with Pluggable Authentication Modules (PAM)
++# lnps	Linux with Pluggable Authentication Modules (PAM, shared c-client lib)
+ # lmd	Mandrake Linux
+ # lr5	RedHat Enterprise 5 and later (same as lfd)
+ # lrh	RedHat Linux 7.2 and later
+@@ -306,7 +308,7 @@
+ 
+ # Note on SCO you may have to set LN to "ln".
+ 
+-a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
++a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lnps lyn mct mnt nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
+ 	$(BUILD) BUILDTYPE=$@
+ 
+ # If you use sv4, you may find that it works to move it to use the an process.
+@@ -371,6 +373,10 @@
+ 	$(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ 	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/etc/pki/tls/certs SSLKEYS=/etc/pki/tls/private GSSDIR=/usr/kerberos"
+ 
++ldbs:	an
++	$(BUILD) BUILDTYPE=lnps IP=$(IP6) \
++	SPECIALS="GSSDIR=/usr SSLDIR=/usr SSLINCLUDE=/usr/include/openssl SSLCERTS=/etc/ssl/certs SSLKEYS=/etc/ssl/private"
++
+ lmd:	an
+ 	$(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ 	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/usr/lib/ssl/certs SSLKEYS=/usr/lib/ssl/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib"
+diff -ruN uw-imap-2006k~dfsg.orig/src/dmail/Makefile uw-imap-2006k~dfsg/src/dmail/Makefile
+--- uw-imap-2006k~dfsg.orig/src/dmail/Makefile	2007-09-11 01:56:35.000000000 +0200
++++ uw-imap-2006k~dfsg/src/dmail/Makefile	2007-12-10 16:00:26.000000000 +0100
+@@ -26,7 +26,7 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
+@@ -35,16 +35,13 @@
+ CFLAGS = -I$C `cat $C/CFLAGS`
+ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+ 
+-dmail: $(CCLIENTLIB) dmail.o dquota.o
++dmail: dmail.o dquota.o
+ 	$(CC) $(CFLAGS) -o dmail dmail.o dquota.o $(LDFLAGS)
+ 
+ dmail.o: $C/mail.h $C/misc.h $C/osdep.h dquota.h
+ 
+ dquota.o: dquota.h
+ 
+-$(CCLIENTLIB):
+-	cd $C;make
+-
+ clean:
+ 	rm -f *.o dmail
+ 
+diff -ruN uw-imap-2006d.dfsg.orig/src/imapd/Makefile uw-imap-2006d.dfsg/src/imapd/Makefile
+--- uw-imap-2006d.dfsg.orig/src/imapd/Makefile	2006-08-31 02:10:44.000000000 +0200
++++ uw-imap-2006d.dfsg/src/imapd/Makefile	2006-12-19 22:11:49.000000000 +0100
+@@ -43,12 +43,12 @@
+ # Get local definitions from c-client directory
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+ CC = `cat $C/CCTYPE`
+ CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
+ 	-DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
+ 	-DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++LDFLAGS = `cat $C/LDFLAGS`
+ 
+ all:	imapd
+ 
+diff -ruN uw-imap-2006d.dfsg.orig/src/ipopd/Makefile uw-imap-2006d.dfsg/src/ipopd/Makefile
+--- uw-imap-2006d.dfsg.orig/src/ipopd/Makefile	2006-08-31 02:17:30.000000000 +0200
++++ uw-imap-2006d.dfsg/src/ipopd/Makefile	2006-12-19 22:11:49.000000000 +0100
+@@ -26,14 +26,14 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
+ 
+ CC = `cat $C/CCTYPE`
+ CFLAGS = -I$C `cat $C/CFLAGS`
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++LDFLAGS = `cat $C/LDFLAGS`
+ 
+ ipopd: ipop2d ipop3d
+ 
+diff -ruN uw-imap-2006d.dfsg.orig/src/mailutil/Makefile uw-imap-2006d.dfsg/src/mailutil/Makefile
+--- uw-imap-2006d.dfsg.orig/src/mailutil/Makefile	2006-08-31 02:21:20.000000000 +0200
++++ uw-imap-2006d.dfsg/src/mailutil/Makefile	2006-12-19 22:11:49.000000000 +0100
+@@ -26,7 +26,7 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
+@@ -35,14 +35,11 @@
+ CFLAGS = -I$C `cat $C/CFLAGS`
+ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+ 
+-mailutil: $(CCLIENTLIB) mailutil.o
++mailutil: mailutil.o
+ 	$(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS)
+ 
+ mailutil.o: $C/mail.h $C/misc.h $C/osdep.h
+ 
+-$(CCLIENTLIB):
+-	cd $C;make
+-
+ clean:
+ 	rm -f *.o mailutil
+ 
+diff -ruN uw-imap-2006d.dfsg.orig/src/mtest/Makefile uw-imap-2006d.dfsg/src/mtest/Makefile
+--- uw-imap-2006d.dfsg.orig/src/mtest/Makefile	2006-08-31 02:25:07.000000000 +0200
++++ uw-imap-2006d.dfsg/src/mtest/Makefile	2006-12-19 22:11:49.000000000 +0100
+@@ -26,7 +26,7 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
+@@ -37,14 +37,11 @@
+ 
+ all:	mtest
+ 
+-mtest: $(CCLIENTLIB) mtest.o
++mtest: mtest.o
+ 	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
+ 
+ mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
+ 
+-$(CCLIENTLIB):
+-	cd $C;make
+-
+ clean:
+ 	rm -f *.o mtest || true
+ 
+diff -ruN uw-imap-2006d.dfsg.orig/src/osdep/unix/Makefile uw-imap-2006d.dfsg/src/osdep/unix/Makefile
+--- uw-imap-2006d.dfsg.orig/src/osdep/unix/Makefile	2006-12-08 02:24:54.000000000 +0100
++++ uw-imap-2006d.dfsg/src/osdep/unix/Makefile	2006-12-19 22:13:10.000000000 +0100
+@@ -490,7 +490,19 @@
+ 	 ACTIVEFILE=/var/lib/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+ 	 BASECFLAGS="$(GCCCFLAGS)" \
+-	 BASELDFLAGS="$(PAMLDFLAGS)"
++	 BASELDFLAGS="../c-client/c-client.a $(PAMLDFLAGS)"
++
++lnps:	# Linux Pluggable Authentication modules (c-client as shared lib)
++	$(BUILD) `$(CAT) SPECIALS` OS=lnx \
++	 SIGTYPE=psx CHECKPW=pam CRXTYPE=nfs \
++	 SPOOLDIR=/var/spool \
++	 ACTIVEFILE=/var/lib/news/active \
++	 RSHPATH=/usr/bin/rsh \
++	 BASECFLAGS="-fPIC $(GCCCFLAGS)" \
++	 ARCHIVE="libc-client.so" \
++	 BASELDFLAGS="-L../c-client -lc-client $(PAMLDFLAGS) -lc" \
++	 ARRC="gcc --shared -Wl,-soname,libc-client.so.$(VERSION) $(PAMLDFLAGS) -lc $(EXTRALDFLAGS) $(SSLLDFLAGS) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -o" \
++	 RANLIB=true
+ 
+ lnx:	# Linux non-shadow passwords
+ 	@echo You are building for traditional Linux *without* shadow
+@@ -861,7 +873,7 @@
+ # Cleanup
+ 
+ clean:
+-	sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
++	sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE ARCHIVENAME *FLAGS *TYPE $(ARCHIVE) || true'
+ 
+ 
+ # Dependencies
+@@ -969,6 +981,7 @@
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo $(ARCHIVE) > ARCHIVENAME
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
+diff -ruN uw-imap-2006k~dfsg.orig/src/tmail/Makefile uw-imap-2006k~dfsg/src/tmail/Makefile
+--- uw-imap-2006k~dfsg.orig/src/tmail/Makefile	2007-12-10 16:26:58.000000000 +0100
++++ uw-imap-2006k~dfsg/src/tmail/Makefile	2007-12-10 16:28:07.000000000 +0100
+@@ -26,7 +26,7 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
+@@ -35,16 +35,13 @@
+ CFLAGS = -I$C `cat $C/CFLAGS`
+ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+ 
+-tmail: $(CCLIENTLIB) tmail.o tquota.o
++tmail: tmail.o tquota.o
+ 	$(CC) $(CFLAGS) -o tmail tmail.o tquota.o $(LDFLAGS)
+ 
+ tmail.o: $C/mail.h $C/misc.h $C/osdep.h tquota.h
+ 
+ tquota.o: tquota.h
+ 
+-$(CCLIENTLIB):
+-	cd $C;make
+-
+ clean:
+ 	rm -f *.o tmail
+ 
--- uw-imap-2007b~dfsg.orig/debian/patches/0001_insecure_strcmp.patch
+++ uw-imap-2007b~dfsg/debian/patches/0001_insecure_strcmp.patch
@@ -0,0 +1,28 @@
+diff --git a/src/dmail/dmail.c b/src/dmail/dmail.c
+--- a/src/dmail/dmail.c
++++ b/src/dmail/dmail.c
+@@ -228,7 +228,7 @@ int deliver (FILE *f,unsigned long msglen,char *user)
+ 				/* have a mailbox specifier? */
+   if (mailbox = strchr (user,'+')) {
+     *mailbox++ = '\0';		/* yes, tie off user name */
+-    if (!*mailbox || !strcmp ("INBOX",ucase (strcpy (tmp,mailbox))))
++    if (!*mailbox || !compare_cstring ((unsigned char *) mailbox,"INBOX"))
+       mailbox = NIL;		/* user+ and user+INBOX same as user */
+   }
+   if (!*user) user = myusername ();
+diff --git a/src/tmail/tmail.c b/src/tmail/tmail.c
+--- a/src/tmail/tmail.c
++++ b/src/tmail/tmail.c
+@@ -602,11 +602,10 @@ int fail (char *string,int code)
+ 
+ char *getusername (char *s,char **t)
+ {
+-  char tmp[MAILTMPLEN];
+   if (*t = strchr (s,'+')) {	/* have a mailbox specifier? */
+     *(*t)++ = '\0';		/* yes, tie off user name */
+ 				/* user+ and user+INBOX same as user */
+-    if (!**t || !strcmp ("INBOX",ucase (strcpy (tmp,*t)))) *t = NIL;
++    if (!**t || !compare_cstring ((unsigned char *) *t,"INBOX")) *t = NIL;
+   }
+   return s;			/* return user name */
+ }
--- uw-imap-2007b~dfsg.orig/debian/patches/2002_mailspool.patch
+++ uw-imap-2007b~dfsg/debian/patches/2002_mailspool.patch
@@ -0,0 +1,21 @@
+diff -ruN uw-imap-2006d.dfsg.orig/src/osdep/unix/Makefile uw-imap-2006d.dfsg/src/osdep/unix/Makefile
+--- uw-imap-2006d.dfsg.orig/src/osdep/unix/Makefile	2006-12-19 22:45:56.000000000 +0100
++++ uw-imap-2006d.dfsg/src/osdep/unix/Makefile	2006-12-19 22:47:12.000000000 +0100
+@@ -486,7 +486,7 @@
+ lnp:	# Linux Pluggable Authentication modules
+ 	$(BUILD) `$(CAT) SPECIALS` OS=slx \
+ 	 SIGTYPE=psx CHECKPW=pam CRXTYPE=nfs \
+-	 SPOOLDIR=/var/spool \
++	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+ 	 ACTIVEFILE=/var/lib/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+ 	 BASECFLAGS="$(GCCCFLAGS)" \
+@@ -495,7 +495,7 @@
+ lnps:	# Linux Pluggable Authentication modules (c-client as shared lib)
+ 	$(BUILD) `$(CAT) SPECIALS` OS=lnx \
+ 	 SIGTYPE=psx CHECKPW=pam CRXTYPE=nfs \
+-	 SPOOLDIR=/var/spool \
++	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+ 	 ACTIVEFILE=/var/lib/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+ 	 BASECFLAGS="-fPIC $(GCCCFLAGS)" \
--- uw-imap-2007b~dfsg.orig/debian/patches/1003_maildir.patch
+++ uw-imap-2007b~dfsg/debian/patches/1003_maildir.patch
@@ -0,0 +1,2933 @@
+diff -ruN uw-imap-2007~dfsg.orig/README.maildir uw-imap-2007~dfsg/README.maildir
+--- uw-imap-2007~dfsg.orig/README.maildir	1970-01-01 01:00:00.000000000 +0100
++++ uw-imap-2007~dfsg/README.maildir	2007-12-26 20:13:06.000000000 +0100
+@@ -0,0 +1,244 @@
++-------------------------------------------------------------------------------
++
++Maildir Driver for Alpine 0.9999
++By Eduardo Chappa <chappa@washington.edu>
++http://staff.washington.edu/chappa/alpine/
++
++-------------------------------------------------------------------------------
++1. General Information About This Patch
++---------------------------------------
++
++This patch adds support for the maildir format to Pine. We take the 
++approach that this patch is one more driver among the number of formats 
++supported by Pine (more generally c-client). This approach differs from 
++older versions of similar patches, in that once a maildir patch was 
++applied, it was assumed that all your folders would be created in the 
++maildir format. 
++
++This patch does not assume that maildir is a preferred format, instead 
++puts maildir in equal footing with other formats (mbox, mbx, etc), and so 
++a maildir folder in the mail/ collection is treated in the same way as any 
++other folder in any other format. In another words, just by reading the 
++name of a folder, or opening it, or doing any operation with it, you can 
++not know in which format the folder is.
++
++This implies that if you want to add a folder in the maildir format to the 
++mail/ collection, then you must add by pressing "A" in the folder list 
++collection and enter "#driver.md/mail/name_maildir_folder".
++
++If you only want to use maildir, however, you can do so too. In this case, 
++you must create a maildir collection. In that collection, only maildir 
++folders will be listed. If there is any folder in any other format, that 
++folder will be ignored. In another words, any folder listed there is in 
++maildir format and can be accessed through that collection, conversely, 
++any folder not listed there is not in maildir format and there is no way 
++to access it using this collection.
++
++In order to create a maildir collection, you could press M S L, and "A" to 
++add a collection. Fill in the required fields as follows:
++
++Nickname  : Anything
++Server    :
++Path      : #md/relative/path/to/maildir/collection/
++View      :
++
++For example, if "path" is set to "#md/mail/", then Pine will look for your 
++maildir folders that are in ~/mail/.
++
++The code in this patch is mostly based in code for the unix driver plus 
++some combinations of the mh, mbx and nntp drivers for the c-client 
++library. Those drivers were designed by Mark Crispin, and bugs in this 
++code are not his bugs, but my own.
++
++  I got all the specification for this patch from 
++http://cr.yp.to/proto/maildir.html. If you know of a place with a better 
++specification for maildir format please let me know. The method this patch 
++uses to create a unique filename for a message is one of the "old 
++fashioned" methods. I realize that this is old fashioned, but it is 
++portable, and portability is the main reason why I decided to use an old 
++fashioned method (most methods are not portable. See the word 
++"Unfortunately" in that document).
++
++--------------
++2. Other Goals
++--------------
++
++  It is intended that this code will work well with any application 
++written using the c-client library. Of paramount importance is to make the 
++associated imap server work well when the server accesses a folder in 
++Maildir format. The program mailutil should also work flawlessly with this 
++implemetation of the driver.
++
++  It is intended that this driver be fast and stable. We intend not to 
++patch Pine to make this driver do its work, unless such patching is for 
++fixing bugs in Pine or to pass parameters to the driver.
++
++----------------------------------------
++3. One sided comparison to other patches
++----------------------------------------
++
++There are two other maildir patches that could be easily adapted for 
++version 4.64. 
++
++The first one is the patch distributed by SuSe which can be downloaded 
++from http://hico.fphil.uniba.sk/pine-patches.html. This patch was last 
++updated for version 4.58. Several hunks fail to be applied when you try to 
++apply it to Pine 4.64. Even if you apply those hunks manually there will 
++still be the following bugs:
++
++  * You can not save between any two storage systems. The old patch did 
++    not do this well, because it had to modify the mailcmd.c file in order 
++    to save messages to a unix style mailbox, and this is undesirable, 
++    because the mailutil application associated to this patch would fail 
++    to save messages.
++  * It corrupts messages when it saves them to a mbx format folder.
++  * It could not save messages to the INBOX folder.
++  * It crashes when two different clients are accessing the same mailbox:  
++    For example, if a message is marked deleted in one session, then it 
++    should be marked deleted in any other session too, but instead it 
++    crashes the second session.
++  * Pine crashes when saving several messages to a maildir (not even the 
++    prototype of the function is correctly defined).
++  * Pine crashes when checking for the STATUS of a maildir mailbox.
++  * Pine could not delete a maildir folder.
++  * Pine could not rename a maildir folder.
++
++The other patch is available from Glue Logic (GL), was last updated for 
++version 4.61 and fails to apply a hunk in version 4.64, which must be 
++manually applied. There are, however, several problems and bugs. The patch 
++can be found at http://www.gluelogic.com/code/PINE-maildir/
++
++  * [Bug] It changes the default sort by arrival into sort by Date in 
++    every folder. This makes Pine sort incorrectly any folder (no matter 
++    in which format such folder is).
++
++  * [Missing Important Feature] Lacks support for dual folder use. You can 
++    not create a directory with the same name than a given folder and use 
++    it!
++
++  * [Bug] It confuses Unseen and Recent messages. Unseen messages are 
++    reported as Recent. An Unseen message is a message that had not been 
++    read the last time the folder was closed (or had been read but marked 
++    Unseen in an earlier session). A Recent message is one which was not 
++    in the folder the last time it was closed. Recent messages are your 
++    real new messages, but Unseen are not. In GL patch, every Unseen 
++    message is treated as Recent!.
++
++  * [Problem] Large folders take long time to be opened for the first 
++    time.
++
++  * [Bug] Reported sizes are the number of bytes in the message and not 
++    the "on the wire" size. If you were to manually edit a message and 
++    either add or remove information from it, the size reported by Pine 
++    would not be affected by this change.
++
++  * [Bug] Crashes when two sessions access the same mailbox and one 
++    deletes and expunges a message while the other tries to read that 
++    message. (explicitly, if session A uses the GL patch, and session B 
++    uses my patch, then the following procedure crashes session A:
++
++       - In session B delete and expunge a message.
++       - Open that message in session A. Session A will notice it is gone 
++         and will not crash.
++       - In session A delete and expunge a message.
++       - Open that message in session B. Session B will print a message 
++         about no such message, then it will go back to the index screen 
++         telling you that the message your were viewing was gone.
++       - Now in session B delete and expunge a message.
++       - Open that message in session A, Pine will crash).
++
++  * [Bug] The patch changes the name of a message-file by adding a place 
++    for the size in the name of the message-file. By doing so it breaks 
++    the maildir specification which only allows you to change the name by 
++    changing flags. If there is another client reading that mailbox, there 
++    is a chance that the other client will fail finding messages due to 
++    changes made by the GL patch.
++
++  * [Bug] Any patch for Maildir support is NOT a patch for Pine (despite 
++    the fact that you have read many times that the patch is for Pine), 
++    but a patch for the C-Client library. As such it should work well with 
++    any application that can be built with such library, like the UW-IMAP 
++    server. The GL patch has a self proclaimed message stating not to use 
++    the associated IMAP server to read Maildirs. This restriction does not 
++    apply to my patch. I encourage you to use the server built with my 
++    patch to access Maildirs.
++
++------------------------------------------------------------------------ 
++4. What are the known bugs of this implementation of the Maildir driver? 
++------------------------------------------------------------------------
++
++  I don't know any at this time. There have been bugs before, though, but 
++I try to fix bugs as soon as they are reported. All bugs of the other 
++patches have been reported but not fixed, either because there was no one 
++maintaining the patch, or the maintainer has not fixed them yet (all these 
++reports were made as late as November 2004). A very complete list of 
++updates for this patch, which includes bug fixes, improvements and 
++addition of new features can be found at
++
++ http://staff.washington.edu/chappa/alpine/updates/maildir.html
++
++----------
++5. On UIDs
++----------
++
++ This patch does not keep UIDs between sessions, but hopefully it does 
++keep consistent UIDs during one session. This is not a bug of the driver, 
++instead it is a shortcoming of the maildir specification. The main point 
++of the maildir configuration is that you should never (read my lips) ever 
++edit the message, but edit the filename associated to the message. Well, I 
++could not find any single place in the web where it was told how to save 
++the UID of a message, if there is one please let me know and I will add 
++UID support for this driver.
++
++--------------------------------------------
++6. Configuring Pine and Setting up a Maildir 
++--------------------------------------------
++
++Once this approach was chosen, it implied the following:
++
++    * This patch assumes that your INBOX is located at "$HOME/Maildir".  
++      This is a directory which should have three subdirectories "cur", 
++      "tmp" and "new". Mail is delivered to 'new' and read from 'cur'. I 
++      have added a configuration option "maildir-location" which can be 
++      used to tell Pine where your Maildir inbox is, in case your system 
++      do not use the above directory (e.g. your system may use 
++      "~/.maildir"). In this case define that variable to be the name of 
++      the directory where your e-mail is being delivered (e.g.  
++      ".maildir").
++
++    * If you want to use the above configuration as your inbox, you must 
++      define your inbox-path as "#md/inbox" (no quotes).  You can define 
++      the inbox-path like above even if you have changed the 
++      maildir-location variable. That's the whole point of that variable.
++
++-----------------------------------
++7. What about Courier file systems?
++-----------------------------------
++
++In a courier file system all folders are subfolders of a root folder 
++called INBOX. Normally INBOX is located at ~/Maildir and subfolders are 
++"dot" directories in ~/Maildir. For example ~/Maildir/.Trash is a 
++subfolder of INBOX and is accessed with the nickname "INBOX.Trash".
++
++You can not access folders in this way unless you preceed them with the 
++string "#mc/". The purpose of the string "#mc/" is to warn Pine that a 
++collection in the Courier format is going to be accessed, so you can 
++SELECT a folder like "#mc/INBOX.Trash", but not "INBOX.Trash"
++
++You can access a collection through a server, but if you want to access a 
++collection of folders created using the Courier server, you MUST edit your
++".pinerc" file and enter the definition of the collection as follows:
++
++folder-collections="Anything you want" #mc/INBOX.[]
++
++You can replace the string "#mc/INBOX." by something different, for example
++"#mc/Courier/." will make Pine search for your collection in ~/Courier.
++
++You can not add this directly into Pine because Pine fails to accept this 
++value from its input, but it takes it correctly when it is added through 
++the ".pinerc" file.
++
++You can access your inbox as "#mc/INBOX" or "#md/INBOX". Both definitions 
++point to the same place.
++
++Last Updated November 21, 2005
+diff -ruN uw-imap-2007~dfsg.orig/src/c-client/mail.c uw-imap-2007~dfsg/src/c-client/mail.c
+--- uw-imap-2007~dfsg.orig/src/c-client/mail.c	2007-12-26 19:33:39.000000000 +0100
++++ uw-imap-2007~dfsg/src/c-client/mail.c	2007-12-26 20:12:59.000000000 +0100
+@@ -991,7 +991,7 @@
+   MAILSTREAM *ts;
+   char *s,*t,tmp[MAILTMPLEN];
+   size_t i;
+-  DRIVER *d;
++  DRIVER *d, *md;
+ 				/* never allow names with newlines */
+   if (s = strpbrk (mailbox,"\015\012")) {
+     MM_LOG ("Can't create mailbox with such a name",ERROR);
+@@ -1015,6 +1015,8 @@
+     return NIL;
+   }
+ 
++  /* Hack, we should do this better, but it works */
++    for (md = maildrivers; md && strcmp (md->name, "md"); md = md->next);
+ 				/* see if special driver hack */
+   if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) &&
+       ((mailbox[2] == 'r') || (mailbox[2] == 'R')) &&
+@@ -1045,6 +1047,13 @@
+ 	   (((*mailbox == '{') || (*mailbox == '#')) &&
+ 	    (stream = mail_open (NIL,mailbox,OP_PROTOTYPE | OP_SILENT))))
+     d = stream->dtb;
++  else if(mailbox[0] == '#'
++	&& (mailbox[1] == 'm' || mailbox[1] == 'M')
++	&& (mailbox[2] == 'd' || mailbox[2] == 'D'
++	    || mailbox[2] == 'c' || mailbox[2] == 'C')
++	&& mailbox[3] == '/'
++	&& mailbox[4] != '\0')
++     return (*md->create)(stream, mailbox);
+   else if ((*mailbox != '{') && (ts = default_proto (NIL))) d = ts->dtb;
+   else {			/* failed utterly */
+     sprintf (tmp,"Can't create mailbox %.80s: indeterminate format",mailbox);
+diff -ruN uw-imap-2007~dfsg.orig/src/c-client/mail.h uw-imap-2007~dfsg/src/c-client/mail.h
+--- uw-imap-2007~dfsg.orig/src/c-client/mail.h	2007-12-26 19:33:39.000000000 +0100
++++ uw-imap-2007~dfsg/src/c-client/mail.h	2007-12-26 20:12:59.000000000 +0100
+@@ -353,6 +353,10 @@
+ #define SET_SCANCONTENTS (long) 573
+ #define GET_MHALLOWINBOX (long) 574
+ #define SET_MHALLOWINBOX (long) 575
++#define GET_COURIERSTYLE (long) 576
++#define SET_COURIERSTYLE (long) 577
++#define SET_MDINBOXPATH  (long) 578
++#define GET_MDINBOXPATH  (long) 579
+ 
+ /* Driver flags */
+ 
+diff -ruN uw-imap-2007~dfsg.orig/src/osdep/unix/dummy.c uw-imap-2007~dfsg/src/osdep/unix/dummy.c
+--- uw-imap-2007~dfsg.orig/src/osdep/unix/dummy.c	2007-12-26 19:33:39.000000000 +0100
++++ uw-imap-2007~dfsg/src/osdep/unix/dummy.c	2007-12-26 20:12:59.000000000 +0100
+@@ -106,11 +106,13 @@
+  * Accepts: mailbox name
+  * Returns: our driver if name is valid, NIL otherwise
+  */
+-
++char * maildir_remove_root(char *);
+ DRIVER *dummy_valid (char *name)
+ {
+   char *s,tmp[MAILTMPLEN];
+   struct stat sbuf;
++  strcpy(tmp, name);
++  name = maildir_remove_root(tmp);
+ 				/* must be valid local mailbox */
+   if (name && *name && (*name != '{') && (s = mailboxfile (tmp,name))) {
+ 				/* indeterminate clearbox INBOX */
+@@ -454,6 +456,8 @@
+ {
+   char *s,tmp[MAILTMPLEN];
+   long ret = NIL;
++  if(!strncmp(mailbox,"#md/",4) || !strncmp(mailbox,"#mc/", 4))
++    return maildir_create(stream, mailbox);
+ 				/* validate name */
+   if (!(compare_cstring (mailbox,"INBOX") && (s = dummy_file (tmp,mailbox)))) {
+     sprintf (tmp,"Can't create %.80s: invalid name",mailbox);
+@@ -519,6 +523,14 @@
+ {
+   struct stat sbuf;
+   char *s,tmp[MAILTMPLEN];
++  if (!strncmp(mailbox,"#md/",4) || !strncmp(mailbox,"#mc/", 4) 
++	|| is_valid_maildir(&mailbox)){
++    char tmp[MAILTMPLEN] = {'\0'};
++    strcpy(tmp, mailbox);
++    if(tmp[strlen(tmp) - 1] != '/')
++       tmp[strlen(tmp)] = '/';
++     return maildir_delete(stream, tmp);
++  }
+   if (!(s = dummy_file (tmp,mailbox))) {
+     sprintf (tmp,"Can't delete - invalid name: %.80s",s);
+     MM_LOG (tmp,ERROR);
+@@ -545,6 +557,11 @@
+ {
+   struct stat sbuf;
+   char c,*s,tmp[MAILTMPLEN],mbx[MAILTMPLEN],oldname[MAILTMPLEN];
++
++  strcpy(tmp, old);
++  old = maildir_remove_root(tmp);
++  strcpy(tmp, newname);
++  newname = maildir_remove_root(tmp);
+ 				/* no trailing / allowed */
+   if (!dummy_file (oldname,old) || !(s = dummy_file (mbx,newname)) ||
+       stat (oldname,&sbuf) || ((s = strrchr (s,'/')) && !s[1] &&
+diff -ruN uw-imap-2007~dfsg.orig/src/osdep/unix/maildir.c uw-imap-2007~dfsg/src/osdep/unix/maildir.c
+--- uw-imap-2007~dfsg.orig/src/osdep/unix/maildir.c	1970-01-01 01:00:00.000000000 +0100
++++ uw-imap-2007~dfsg/src/osdep/unix/maildir.c	2007-12-26 20:12:59.000000000 +0100
+@@ -0,0 +1,2325 @@
++/*
++ * Maildir driver for Alpine 0.99999
++ * 
++ * Written by Eduardo Chappa <chappa@washington.edu>
++ * Last Update: November 22, 2007
++ *
++ * The IMAP toolkit provided in this Distribution is
++ * Copyright 2004 University of Washington.
++ * The full text of our legal notices is contained in the file called
++ * CPYRIGHT, included with this Distribution.
++ */
++
++#include <stdio.h>
++#include <ctype.h>
++#include <errno.h>
++extern int errno;		/* just in case */
++#include "mail.h"
++#include "osdep.h"
++#include <pwd.h>
++#include <sys/stat.h>
++#include <sys/time.h>
++#include "maildir.h"
++#include "rfc822.h"
++#include "fdstring.h"
++#include "misc.h"
++#include "dummy.h"
++
++/* Driver dispatch used by MAIL */
++DRIVER maildirdriver = {
++  "md",			/* driver name, yes it's md, not maildir */
++				/* driver flags */
++  DR_MAIL|DR_LOCAL|DR_NAMESPACE|DR_NOSTICKY|DR_DIRFMT,
++  (DRIVER *) NIL,		/* next driver 				*/
++  maildir_valid,		/* mailbox is valid for us 		*/
++  maildir_parameters,		/* manipulate parameters		*/
++  NIL,			/* scan mailboxes 			*/
++  maildir_list,		/* find mailboxes 			*/
++  maildir_lsub,		/* find subscribed mailboxes 		*/
++  maildir_sub,		/* subscribe to mailbox 		*/
++  maildir_unsub,		/* unsubscribe from mailbox 		*/
++  maildir_create,		/* create mailbox 			*/
++  maildir_delete,		/* delete mailbox 			*/
++  maildir_rename,		/* rename mailbox 			*/
++  mail_status_default,	/* status of mailbox 			*/
++  maildir_open,		/* open mailbox				*/
++  maildir_close,		/* close mailbox 			*/
++  maildir_fast,		/* fetch message "fast" attributes	*/
++  NIL,			/* fetch message flags 			*/
++  NIL,			/* fetch overview 			*/
++  NIL,			/* fetch message structure 		*/
++  maildir_header,		/* fetch message header 		*/
++  maildir_text,		/* fetch message body 			*/
++  NIL,			/* fetch partial message text 		*/
++  NIL,			/* unique identifier 			*/
++  NIL,			/* message number 			*/
++  NIL,			/* modify flags 			*/
++  maildir_flagmsg,		/* per-message modify flags 		*/
++  NIL,			/* search for message based on criteria */
++  NIL,			/* sort messages 			*/
++  NIL,			/* thread messages 			*/
++  maildir_ping,		/* ping mailbox to see if still alive 	*/
++  maildir_check,		/* check for new messages		*/
++  maildir_expunge,		/* expunge deleted messages 		*/
++  maildir_copy,		/* copy messages to another mailbox 	*/
++  maildir_append,		/* append string message to mailbox 	*/
++  NIL				/* garbage collect stream 		*/
++};
++
++
++DRIVER courierdriver = {
++  "mc",			/* Why a separate driver? So that
++				   createproto will work		*/
++				/* driver flags */
++  DR_MAIL|DR_LOCAL|DR_NAMESPACE|DR_NOSTICKY|DR_DIRFMT,
++  (DRIVER *) NIL,		/* next driver 				*/
++  maildir_valid,		/* mailbox is valid for us 		*/
++  maildir_parameters,		/* manipulate parameters		*/
++  NIL,			/* scan mailboxes 			*/
++  courier_list,		/* find mailboxes 			*/
++  maildir_lsub,		/* find subscribed mailboxes 		*/
++  maildir_sub,		/* subscribe to mailbox 		*/
++  maildir_unsub,		/* unsubscribe from mailbox 		*/
++  maildir_create,		/* create mailbox 			*/
++  maildir_delete,		/* delete mailbox 			*/
++  maildir_rename,		/* rename mailbox 			*/
++  mail_status_default,	/* status of mailbox 			*/
++  maildir_open,		/* open mailbox				*/
++  maildir_close,		/* close mailbox 			*/
++  maildir_fast,		/* fetch message "fast" attributes	*/
++  NIL,			/* fetch message flags 			*/
++  NIL,			/* fetch overview 			*/
++  NIL,			/* fetch message structure 		*/
++  maildir_header,		/* fetch message header 		*/
++  maildir_text,		/* fetch message body 			*/
++  NIL,			/* fetch partial message text 		*/
++  NIL,			/* unique identifier 			*/
++  NIL,			/* message number 			*/
++  NIL,			/* modify flags 			*/
++  maildir_flagmsg,		/* per-message modify flags 		*/
++  NIL,			/* search for message based on criteria */
++  NIL,			/* sort messages 			*/
++  NIL,			/* thread messages 			*/
++  maildir_ping,		/* ping mailbox to see if still alive 	*/
++  maildir_check,		/* check for new messages		*/
++  maildir_expunge,		/* expunge deleted messages 		*/
++  maildir_copy,		/* copy messages to another mailbox 	*/
++  maildir_append,		/* append string message to mailbox 	*/
++  NIL				/* garbage collect stream 		*/
++};
++
++MAILSTREAM maildirproto = {&maildirdriver};	/* prototype stream */
++MAILSTREAM courierproto = {&courierdriver};	/* prototype stream */
++
++long maildir_dirfmttest (char *name)
++{
++  int i;
++  for (i = 0; mdstruct[i] && strcmp(name, mdstruct[i]); i++);
++  return (i < EndDir) || !strcmp(name, MDDIR) ? LONGT : NIL;
++}
++
++void 
++md_domain_name(void)
++{
++   int i;
++
++   strcpy(mdlocaldomain,mylocalhost ());
++   for (i = 0; mdlocaldomain[i] ; i++)
++      if(mdlocaldomain[i] == '/')
++	 mdlocaldomain[i] = '\057';
++      else if (mdlocaldomain[i] == ':')
++	 mdlocaldomain[i] =  '\072';
++}
++
++char *
++myrootdir(char *name)
++{
++return myhomedir();
++}
++
++char *
++mdirpath(void)
++{
++  char *path = maildir_parameters(GET_MDINBOXPATH,NIL);
++  return path ? (*path ? path : ".") : "Maildir";
++}
++
++/* remove the "#md/" or "#mc/" part from a folder name */
++char *
++maildir_remove_root (char *name)
++{
++  int courier = IS_COURIER(name), offset;
++  char realname[MAILTMPLEN];
++
++  offset = maildir_valid_name(name) ? (name[3] == '/' ? 4 : 3) : 0;
++  if(courier)
++     courier_realname(name+offset, realname);
++  else
++     strcpy(realname, name+offset);
++  return cpystr(realname);
++}
++
++
++/* Check validity of the name, we accept:
++ *	a) #md/directory/folder
++ *	b) #md/inbox
++ * A few considerations: We can only accept as valid
++ *  a) names that start with #md/ and the directory exists or
++ *  b) names that do not start with #md/ but are maildir directories (have
++ *     the /cur, /tmp and /new structure)
++ */
++int maildir_valid_name (char *name)
++{
++  char tmpname[MAILTMPLEN] = {'\0'};
++
++   if (mdfpath)
++      fs_give((void **)&mdfpath);
++   if (name && (name[0] != '#'))
++	sprintf(tmpname,"%s%s",MDPREFIX(CCLIENT), name);
++   mdfpath = cpystr(tmpname[0] ? tmpname : name);
++
++  return IS_CCLIENT(name) || IS_COURIER(name);
++}
++
++/* Check if the directory whose path is given by name is a valid maildir
++ *  directory (contains /cur, /tmp and /new)
++ */
++int maildir_valid_dir (char *name)
++{
++ int len;
++ DirNamesType i;
++ struct stat sbuf;
++ char tmp[MAILTMPLEN];
++
++   if(name[strlen(name) - 1] == '/')
++      name[strlen(name) - 1] = '\0';
++   len = strlen(name);
++   for (i = Cur; i != EndDir; i++){
++      MDFLD(tmp, name, i);
++      if (stat(tmp, &sbuf) < 0 || !S_ISDIR(sbuf.st_mode))
++	  break;
++   }
++   name[len] = '\0';
++   return (i == EndDir) ? T : NIL;
++}
++
++void courier_realname(char *name, char *realname)
++{
++  int i,j;
++
++  if(!name)
++    return;
++
++  for (i = 0, j = 0; i < MAILTMPLEN && j < strlen(name); j++, i++){
++      realname[i] = name[j];
++      if(name[j] == '/' && name[j+1] != '.' && name[j+1] != '%' 
++		&& name[j+1] != '*') 
++	realname[++i] = '.';
++  }
++  if(realname[i-1] == '.')
++    i--; 
++  realname[i] = '\0';
++}
++
++
++/* given a maildir folder, return its path. Memory freed by caller. Directory
++ * does not contain the trailing slash "/". On error NULL is returned.
++ */
++int maildir_file_path (char *name, char *tmp)
++{
++   char *maildirpath = mdirpath();
++   int courier = IS_COURIER(name);
++
++   /* There are several ways in which the path can come, so we will handle 
++      them here. First we deal with #mc/ or #md/ prefix by removing the 
++      prefix, if any */
++
++    if(strlen(name) >= MAILTMPLEN)
++      name[MAILTMPLEN] = '\0';
++    strcpy(tmp, name);
++    name = maildir_remove_root(tmp);
++    tmp[0] = '\0';	/* just in case something fails */
++
++    if (strlen(myrootdir(name)) + 
++		max(strlen(name), strlen(maildirpath)) > MAILTMPLEN){
++	errno = ENAMETOOLONG;
++	sprintf(tmp,"Error opening \"%s\": %s", name, strerror (errno));
++	mm_log(tmp,ERROR);
++	return NIL;
++    }
++
++    /* There are two ways in which the name can come here, either as a 
++       full path or not. If it is not a full path it can come in two ways, 
++       either as a file system path (Maildir/.Drafts) or as a maildir path 
++       (INBOX.Drafts)
++     */
++
++     if(*name == '/')	/* full path */
++	strcpy(tmp, name); /* do nothing */
++     else{
++	sprintf (tmp,"%s/%s%s%s", myrootdir (name),
++	    strncmp (ucase (strcpy (tmp, name)), "INBOX", 5) 
++		? name : maildirpath,
++	    strncmp (ucase (strcpy (tmp, name)), "INBOX", 5) 
++		? "" : (courier ? "/" : ""),
++	    strncmp (ucase (strcpy (tmp, name)), "INBOX", 5) 
++		? "" : (*(name+5) == MDSEPARATOR(courier) ? name+5 : ""));
++     }
++
++    return tmp[0] ? T : NIL;
++}
++
++/* This function is given a full path for a mailbox and returns
++ * if it is a valid maildir transformed to canonical notation
++ */
++int
++is_valid_maildir (char **name)
++{
++  if (!strncmp(*name, myrootdir (*name), strlen(myrootdir(*name)))){
++     (*name) += strlen(myrootdir(*name));
++     if (**name == '/') (*name)++;
++  }
++  return maildir_valid(*name) ? T :  NIL;
++}
++
++/* Check validity of mailbox. This routine does not send errors to log, other
++ *  routines calling this one may do so, though
++ */ 
++
++DRIVER *maildir_valid (char *name)
++{
++   char tmpname[MAILTMPLEN];
++
++   maildir_file_path(name, tmpname);
++   
++   return maildir_valid_dir(tmpname) 
++		? (IS_COURIER(name) ? &courierdriver : &maildirdriver) : NIL;
++}
++
++void maildir_fast (MAILSTREAM *stream,char *sequence,long flags)
++{
++  unsigned long i;
++  MESSAGECACHE *elt;
++                                /* get sequence */
++  if (stream && LOCAL && ((flags & FT_UID) ?
++                          mail_uid_sequence (stream,sequence) :
++                          mail_sequence (stream,sequence)))
++    for (i = 1L; i <= stream->nmsgs; i++) {
++      if ((elt = mail_elt (stream,i))->sequence && (elt->valid = T) &&
++          !(elt->day && elt->rfc822_size)) {
++        ENVELOPE **env = NIL;
++        ENVELOPE *e = NIL;
++        if (!stream->scache) env = &elt->private.msg.env;
++        else if (stream->msgno == i) env = &stream->env;
++        else env = &e;
++        if (!*env || !elt->rfc822_size) {
++          STRING bs;
++          unsigned long hs;
++          char *ht = (*stream->dtb->header) (stream,i,&hs,NIL);
++
++          if (!*env) rfc822_parse_msg (env,NIL,ht,hs,NIL,BADHOST,
++                                       stream->dtb->flags);
++          if (!elt->rfc822_size) {
++            (*stream->dtb->text) (stream,i,&bs,FT_PEEK);
++            elt->rfc822_size = hs + SIZE (&bs) - GETPOS (&bs);
++          }
++        }
++
++        if (!elt->day && *env && (*env)->date)
++          mail_parse_date (elt,(*env)->date);
++
++        if (!elt->day) elt->day = elt->month = 1;
++        mail_free_envelope (&e);
++      }
++    }
++}
++
++int
++maildir_eliminate_duplicate (char *name, struct direct ***flist, unsigned long *nfiles)
++{
++   int i, j, k, error = 0, scanr;
++   char new[MAILTMPLEN], old[MAILTMPLEN], tmp[MAILTMPLEN], *str;
++   struct direct **names = NIL;
++
++   if((scanr = maildir_doscandir(name, &names, CCLIENT)) < 0)
++     return -1;
++
++   if(nfiles) *nfiles = scanr;
++   for(i = 0, j = 1, k = 0;  j < scanr; i++, j++){
++      if(k)
++	names[i] = names[i+k];
++      if(same_maildir_file(names[i]->d_name, names[j]->d_name)){
++	int d, f, r, s;
++	maildir_getflag(names[i]->d_name, &d, &f, &r, &s, NIL);
++	sprintf(old,"%s/%s", name, names[i]->d_name);
++	sprintf(new,"%s/.%s", name, names[i]->d_name);
++	if(rename(old, new) < 0 && errno != EEXIST)
++	  error++;
++	if(!error){
++	  for(; j < scanr
++		&& same_maildir_file(names[i]->d_name, names[j]->d_name)
++	      ; j++, k++){
++	      maildir_getflag(names[j]->d_name, (d ? NIL : &d), 
++			(f ? NIL : &f), (r ? NIL : &r), (s ? NIL : &s), NIL);
++	      sprintf(tmp,"%s/%s", name, names[j]->d_name);
++	      if(unlink(tmp) < 0){	/* Hmmm... a problem, let's see */
++		struct stat sbuf;
++		if (stat(tmp, &sbuf) == 0 && (sbuf.st_mode & S_IFMT) == S_IFREG)
++		   error++;
++	      }
++	  }
++	  if((str = strchr(names[i]->d_name,FLAGSEP)) != NULL) *str = '\0';
++	  sprintf (old,"%s/%s%s%s%s%s%s", name, names[i]->d_name, MDSEP(2),
++		MDFLAG(Draft, d), MDFLAG(Flagged, f), MDFLAG(Replied, r), 
++		MDFLAG(Seen, s));
++	  if(rename(new, old) < 0)
++	     error++;
++	}
++      }
++
++   }
++   if(k > 0)
++     fs_give((void **)&names);
++   else
++     *flist = names;
++   return error ? -1 : k;
++}
++
++int
++maildir_doscandir(char *name, struct direct ***flist, int flag)
++{
++return scandir(name, flist, 
++		(flag == CCLIENT ? maildir_select : courier_dir_select), 
++		(flag == CCLIENT ? maildir_namesort : courier_dir_sort));
++}
++
++/* 
++ * return all files in a given directory. This is a separate call
++ * so that if there are warnings during compilation this only appears once.
++ */
++unsigned long
++maildir_scandir (char *name, struct direct ***flist, 
++			unsigned long *nfiles, int *scand, int flag)
++{
++  struct stat sbuf;
++  int rv = -2;	/* impossible value */
++
++  if (scand)
++     *scand = -1;	/* assume error for safety */
++  *nfiles = 0;
++  if((stat(name,&sbuf) < 0) 
++	|| (flag == CCLIENT
++	 && ((rv = maildir_eliminate_duplicate(name, flist, nfiles)) < 0)))
++     return 0L;
++
++  if (scand && (rv > 0 || rv == -2))
++     *nfiles = maildir_doscandir(name, flist, flag);
++
++  if(scand) *scand = *nfiles;
++
++  return (unsigned long) sbuf.st_ctime;
++}
++
++/* Does a message with given name exists (or was it removed)?
++ * Returns: 1 - yes, such message exist,
++ *	    0 - No, that message does not exist anymore
++ *
++ * Parameters: stream, name of mailbox, new name if his message does not
++ *		exist.
++ */
++
++int maildir_message_exists(MAILSTREAM *stream, char *name, char *newfile)
++{
++  char tmp[MAILTMPLEN];
++  int gotit = NIL;
++  DIR *dir;
++  struct direct *d;
++  struct stat sbuf;
++
++  /* First check directly if it exists, if not there, look for it */
++  sprintf(tmp,"%s/%s", LOCAL->curdir, name);
++  if ((stat(tmp, &sbuf) == 0) && ((sbuf.st_mode & S_IFMT) == S_IFREG))
++    return T;
++
++  if (!(dir = opendir (LOCAL->curdir)))
++     return NIL;
++
++  while ((d = readdir(dir)) && gotit == NIL){
++    if (d->d_name[0] == '.')
++      continue;
++    if (same_maildir_file(d->d_name, name)){
++	  gotit = T;
++	  strcpy(newfile, d->d_name);
++    }
++  }
++  closedir(dir);
++  return gotit;
++}
++
++/* Maildir open */
++ 
++MAILSTREAM *maildir_open (MAILSTREAM *stream)
++{
++  char tmp[MAILTMPLEN];
++  struct stat sbuf;
++
++  if (!stream) return &maildirproto;
++  if (stream->local) fatal ("maildir recycle stream");
++  md_domain_name();    /* get domain name for maildir files in mdlocaldomain */
++  stream->uid_last  = stream->uid_validity = 0L;
++  if (!stream->rdonly){
++     stream->perm_seen = stream->perm_deleted = stream->perm_flagged = 
++	stream->perm_answered = stream->perm_draft = T;
++  }
++  stream->uid_validity = time(0);
++  stream->local = (MAILDIRLOCAL *) fs_get (sizeof (MAILDIRLOCAL));
++  memset(LOCAL, 0, sizeof(MAILDIRLOCAL));
++  LOCAL->fd = -1;
++
++  LOCAL->courier = IS_COURIER(stream->mailbox);
++  strcpy(tmp, stream->mailbox);
++  if (maildir_file_path (stream->mailbox, tmp))
++     LOCAL->dir = cpystr (tmp);
++  if (LOCAL->dir){
++     MDFLD(tmp, LOCAL->dir, Cur);
++     LOCAL->curdir = cpystr (tmp);
++     if (stat (LOCAL->curdir,&sbuf) < 0) {
++         sprintf (tmp,"Can't open folder %s: %s",
++				stream->mailbox,strerror (errno));
++         mm_log (tmp,ERROR);
++	 maildir_close(stream, 0);
++        return NIL;
++     }
++  }
++
++  if(maildir_file_path (stream->mailbox, tmp)){
++    fs_give ((void **) &stream->mailbox);
++    stream->mailbox = cpystr(tmp);
++  }
++
++  LOCAL->buf = (char *) fs_get ((LOCAL->buflen = SENDBUFLEN) + 1);
++  stream->sequence++;
++  stream->nmsgs = stream->recent = 0L;
++
++  maildir_parse_folder(stream, 1);
++
++  return stream;
++}
++
++/* Maildir initial parsing of the folder */
++void
++maildir_parse_folder (MAILSTREAM *stream, int full)
++{
++   char tmp[MAILTMPLEN], tmp2[MAILTMPLEN];
++   struct direct **namescur = NIL, **namesnew = NIL;
++   unsigned long i, nfilescur = 0L, nfilesnew = 0L, oldpos, newpos, total;
++   int scan_err, rescan, loop = 0;
++
++   if (!stream)		/* what??? */
++      return;
++
++   MM_CRITICAL(stream);
++
++   MDFLD(tmp, LOCAL->dir, New);
++   maildir_scandir (tmp, &namesnew, &nfilesnew, &scan_err, CCLIENT);
++   if (scan_err < 0)
++      maildir_abort(stream);
++
++   /* Scan old messages first, escoba! */
++   if(stream->rdonly ||
++      (LOCAL && ((maildir_initial_check(stream, Cur) == 0)
++							|| nfilesnew > 0L))){
++      MDFLD(tmp, LOCAL->dir, Cur);
++      LOCAL->scantime =  maildir_scandir (tmp, &namescur, &nfilescur, 
++					&scan_err, CCLIENT);
++      if (scan_err < 0){
++	if(namesnew){
++	  for(i = 0L; i < nfilesnew; i++)
++	    fs_give((void **)&namesnew[i]);
++	  fs_give((void **) &namesnew);
++	}
++	 maildir_abort(stream);
++      }
++   }
++   if(LOCAL && (maildir_initial_check(stream, New) == 0)
++	&& (nfilescur > 0L)){
++      MDFLD(tmp, LOCAL->dir, New);
++      while(LOCAL && loop < 10){
++	 if(nfilesnew == 0L)
++	   maildir_scandir (tmp, &namesnew, &nfilesnew, &scan_err, CCLIENT);
++         if (scan_err < 0){
++	    if(namesnew){
++	      for(i = 0L; i < nfilesnew; i++)
++		fs_give((void **)&namesnew[i]);
++	      fs_give((void **) &namesnew);
++	    }
++	    maildir_abort(stream);
++	    break;
++	 }
++	 for(i = 0L, rescan = 0, newpos = oldpos = 0L; 
++		newpos < nfilescur && i < nfilesnew; i++){
++	    if(maildir_message_in_list(namesnew[i]->d_name, namescur, oldpos, 
++						nfilescur - 1L, &newpos)){
++	       oldpos = newpos;
++	       sprintf(tmp2,"%s/%s",tmp,namesnew[i]->d_name);
++	       if(unlink(tmp2) < 0)
++		 scan_err = -1;
++	       rescan++;
++	    }
++	    else
++	      newpos = oldpos;
++	 }
++	 if(scan_err < 0)
++	    maildir_abort(stream);
++	 if(rescan == 0)
++	   break;
++	 else{ /* restart */
++	   if(namesnew){
++	     for(i = 0L; i < nfilesnew; i++)
++		fs_give((void **)&namesnew[i]);
++	     fs_give((void **) &namesnew);
++	   }
++	   nfilesnew = 0L;
++	   loop++;
++	 }
++      }
++   }
++   if(loop == 10)
++     maildir_abort(stream);
++   if(LOCAL){
++     if(stream->rdonly)
++	stream->recent = 0L;
++     total = namescur || stream->rdonly 
++		? maildir_parse_dir(stream, 0L, Cur, namescur, 
++					      nfilescur, full) : stream->nmsgs;
++     stream->nmsgs = maildir_parse_dir(stream, total, New, namesnew, 
++						nfilesnew, full);
++   }
++   if(namesnew){
++     for(i = 0L; i < nfilesnew; i++)
++	fs_give((void **)&namesnew[i]);
++     fs_give((void **) &namesnew);
++   }
++   if(namescur){
++     for(i = 0L; i < nfilescur; i++)
++	fs_give((void **)&namescur[i]);
++     fs_give((void **) &namescur);
++   }
++   MM_NOCRITICAL(stream);
++}
++
++int
++maildir_initial_check (MAILSTREAM *stream, DirNamesType dirtype)
++{
++   char tmp[MAILTMPLEN];
++   struct stat sbuf;
++
++   MDFLD(tmp, LOCAL->dir, dirtype);
++   if (access (tmp, R_OK|W_OK|X_OK) != 0){
++      maildir_abort(stream);
++      return -1;
++   }
++
++   MDFLD(tmp, LOCAL->dir, Cur);
++   if (dirtype != New && 
++	(stat(tmp, &sbuf) < 0 || sbuf.st_ctime == LOCAL->scantime))
++      return -1;
++   return 0;
++}
++
++
++/* Return the number of messages in the directory, while filling the
++ * elt structure.
++ */
++
++unsigned long
++maildir_parse_dir(MAILSTREAM *stream, unsigned long nmsgs,
++		  DirNamesType dirtype, struct direct **names, 
++		  unsigned long nfiles, int full)
++{
++   char tmp[MAILTMPLEN], tmp2[MAILTMPLEN], file[MAILTMPLEN], 
++	newfile[MAILTMPLEN], *mdstr;
++   struct stat sbuf;
++   unsigned long i, new = 0L, l;
++   unsigned long recent = stream ? stream->recent : 0L;
++   int d = 0, f = 0, r = 0, s = 0, t = 0;
++   int we_compute, in_list;
++   int silent = stream ? stream->silent : NIL;
++   MESSAGECACHE *elt;
++
++   MDFLD(tmp, LOCAL->dir, dirtype);
++   if (dirtype == Cur && !stream->rdonly)
++      for (i = 1L; i <= stream->nmsgs;){
++	elt = mail_elt(stream,  i);
++	in_list = elt && elt->private.spare.ptr && nfiles > 0L
++		  ? (MDPOS(elt) < nfiles 
++		    ? same_maildir_file(MDFILE(elt), names[MDPOS(elt)]->d_name)
++		    : NIL)
++		    || maildir_message_in_list(MDFILE(elt), names, 0L, 
++						nfiles - 1L, &MDPOS(elt))
++		  : NIL;
++	if (!in_list){
++	   if (elt->private.spare.ptr)
++	      maildir_free_file ((void **) &elt->private.spare.ptr);
++
++	   if (elt->recent) --recent;
++	   mail_expunged(stream,i);
++	}
++	else i++;
++      }
++
++   stream->silent = T;
++   for (we_compute = 0, i = l = 1L; l <= nfiles; l++){
++      unsigned long pos;
++      if (dirtype == New && !stream->rdonly){ /* move new messages to cur */
++	pos = l - 1L;
++	sprintf (file,"%s/%s", tmp, names[pos]->d_name);
++	if(lstat(file,&sbuf) == 0)
++	   switch(sbuf.st_mode & S_IFMT){
++	    case S_IFREG:
++		strcpy(tmp2, names[pos]->d_name);
++		if((mdstr = strstr(tmp2,MDSEP(3))) 
++		   || (mdstr = strstr(tmp2,MDSEP(2))))
++		   *(mdstr+1) = '2';
++		else
++		   strcat(tmp2, MDSEP(2));
++		sprintf(newfile, "%s/%s",LOCAL->curdir, tmp2);
++		if(link(file,newfile) != 0){
++		   mm_log("Unable to read new mail!", WARN);
++		   continue;
++		}
++		unlink (file);
++		new++;
++	        break;
++	    case S_IFLNK:  /* clean up, clean up, everybody, everywhere */
++		if(unlink(file) < 0){
++		   if(LOCAL->link == NIL){ 
++		      mm_log("Unable to remove symbolic link", WARN);
++		      LOCAL->link = T;
++		   }
++		}
++		continue;
++		break;
++	    default: 
++		if(LOCAL && LOCAL->link == NIL){
++		  mm_log("Unrecognized file or link in folder", WARN);
++		  LOCAL->link = T;
++		}
++		continue;
++		break;
++	   }
++      }
++      mail_exists(stream, i + nmsgs);
++      elt = mail_elt(stream, i + nmsgs);
++      pos = (elt && elt->private.spare.ptr) ? MDPOS(elt) : l - 1L;
++      if (dirtype == New) elt->recent = T;
++      if (!elt->private.uid){
++	 elt->private.uid = stream->uid_last + 1;
++	 stream->uid_validity = time(0);
++      }
++      if (stream->uid_last < elt->private.uid) 
++	  stream->uid_last = elt->private.uid;
++
++      maildir_getflag(names[pos]->d_name, &d, &f, &r ,&s, &t);
++      if (elt->private.spare.ptr)
++	 maildir_free_file_only ((void **)&elt->private.spare.ptr);
++      else{
++	 maildir_get_file((MAILDIRFILE **)&elt->private.spare.ptr);
++	 we_compute++;
++      }
++      MDFILE(elt) = cpystr(names[pos]->d_name);
++      MDPOS(elt)  = pos;
++      MDLOC(elt)  = dirtype;
++      if(dirtype == New && !stream->rdonly){
++	maildir_free_file_only((void **)&elt->private.spare.ptr);
++	MDFILE(elt)  = cpystr(tmp2);
++	MDSIZE(elt)  = sbuf.st_size;
++	MDMTIME(elt) = sbuf.st_mtime;
++	MDLOC(elt)   = Cur;
++      }
++      if (elt->draft != d || elt->flagged != f || 
++	elt->answered != r || elt->seen != s || elt->deleted != t){
++	   elt->draft = d; elt->flagged = f; elt->answered = r;
++	   elt->seen  = s; elt->deleted = t;
++	   if (!we_compute && !stream->rdonly)
++	      MM_FLAGS(stream, i+nmsgs);
++      }
++      maildir_get_date(stream, i+nmsgs);
++      elt->valid = T;
++      i++;
++   }
++   stream->silent = silent;
++   if (dirtype == New && stream->rdonly)
++      new = nfiles;
++   mail_exists(stream, nmsgs  + ((dirtype == New) ? new : nfiles));
++   mail_recent(stream, recent + ((dirtype == New) ? new : 0L));
++
++   return (nmsgs  + (dirtype == New ? new : nfiles));
++}
++
++long maildir_ping (MAILSTREAM *stream)
++{
++  maildir_parse_folder(stream, 0);
++  return stream && LOCAL ? LONGT : NIL;
++}
++
++int maildir_select (const struct direct *name)
++{
++ return (name->d_name[0] != '.');
++}
++
++/*
++ * Unfortunately, there is no way to sort by arrival in this driver, this
++ * means that opening a folder in this driver using the scandir function
++ * will always make this driver slower than any driver that has a natural
++ * way of sorting by arrival (like a flat file format, "mbox", "mbx", etc).
++ */
++int maildir_namesort (const void *d1,const  void *d2)
++{
++  const struct direct **e1, **e2;
++
++  e1 = (const struct direct **)d1;
++  e2 = (const struct direct **)d2;
++
++  return comp_maildir_file((char*)(*e1)->d_name, (char *)(*e2)->d_name);
++}
++
++/* Maildir close */
++
++void maildir_close (MAILSTREAM *stream, long options)
++{
++  MESSAGECACHE *elt;
++  unsigned long i;
++  int silent = stream ? stream->silent : 0;
++  mailcache_t mc = (mailcache_t) mail_parameters (NIL,GET_CACHE,NIL);
++
++  if (!stream) return;
++
++  for (i = 1L; i <= stream->nmsgs; i++)
++    if((elt = (MESSAGECACHE *) (*mc)(stream,i,CH_ELT)) && elt->private.spare.ptr)
++      maildir_free_file ((void **) &elt->private.spare.ptr);
++  stream->silent = T;
++  if (options & CL_EXPUNGE) maildir_expunge (stream, NIL, NIL);
++  maildir_abort(stream);
++  if (mdfpath) fs_give((void **)&mdfpath);
++  stream->silent = silent;
++}
++
++void maildir_check (MAILSTREAM *stream)
++{
++  if (maildir_ping (stream)) mm_log ("Check completed",(long) NIL);   
++}
++
++long maildir_text (MAILSTREAM *stream,unsigned long msgno,STRING *bs, long flags)
++{
++  char tmp[MAILTMPLEN];
++  unsigned long i;
++  MESSAGECACHE *elt;
++  char *s;
++                                /* UID call "impossible" */
++  if (flags & FT_UID || !LOCAL) return NIL;
++  elt = mail_elt (stream, msgno);
++
++  if (!(flags & FT_PEEK) && !elt->seen){
++    elt->seen = T;
++    maildir_flagmsg (stream, elt);
++    MM_FLAGS(stream, elt->msgno);
++  }
++
++  MSGPATH(tmp, LOCAL->dir, MDFILE(elt), MDLOC(elt));
++  if (LOCAL->fd < 0)	/* if file closed ? */
++     LOCAL->fd = open(tmp,O_RDONLY,NIL);
++
++  if (LOCAL->fd < 0 && (errno == EACCES || errno == ENOENT)){
++     INIT (bs, mail_string, "", 0);
++     elt->rfc822_size = 0L;
++     return NIL;
++  }
++
++  s = maildir_text_work(stream, elt, &i, flags);
++  INIT (bs, mail_string, s, i);
++  return LONGT;
++}
++
++char *maildir_text_work (MAILSTREAM *stream,MESSAGECACHE *elt,
++                      unsigned long *length,long flags)
++{
++  FDDATA d;
++  STRING bs;
++  char *s,tmp[CHUNK];
++  unsigned long msgno = elt->msgno;
++  static int try = 0;
++
++  if (length)
++     *length = 0L;
++  LOCAL->buf[0] = '\0';
++
++  MSGPATH(tmp, LOCAL->dir, MDFILE(elt), MDLOC(elt));
++  if (LOCAL->fd < 0)	/* if file closed ? */
++     LOCAL->fd = open(tmp,O_RDONLY,NIL);
++
++  if (LOCAL->fd < 0){		/* flag change? */
++      if (try < 5){
++	try++;
++	if (maildir_update_elt_maildirp(stream, msgno) > 0)
++	  try = 0;
++	return maildir_text_work(stream, mail_elt(stream, msgno),length, flags);
++      }
++      try = 0;
++      return NULL;
++  }
++
++  lseek (LOCAL->fd, elt->private.msg.text.offset,L_SET);
++
++  if (flags & FT_INTERNAL) {    /* initial data OK? */
++    if (elt->private.msg.text.text.size > LOCAL->buflen) {
++      fs_give ((void **) &LOCAL->buf);
++      LOCAL->buf = (char *) fs_get ((LOCAL->buflen =
++                                     elt->private.msg.text.text.size) + 1);
++    }
++    read (LOCAL->fd,LOCAL->buf,elt->private.msg.text.text.size);
++    LOCAL->buf[*length = elt->private.msg.text.text.size] = '\0';
++  }
++  else {
++    if (elt->rfc822_size > LOCAL->buflen) {
++      fs_give ((void **) &LOCAL->buf);
++      LOCAL->buf = (char *) fs_get ((LOCAL->buflen = elt->rfc822_size) + 1);
++    }
++    d.fd = LOCAL->fd;           /* yes, set up file descriptor */
++    d.pos = elt->private.msg.text.offset;
++    d.chunk = tmp;              /* initial buffer chunk */
++    d.chunksize = CHUNK;
++    INIT (&bs,fd_string,&d,elt->private.msg.text.text.size);
++    for (s = LOCAL->buf; SIZE (&bs);) switch (CHR (&bs)) {
++    case '\r':                  /* carriage return seen */
++      *s++ = SNX (&bs);         /* copy it and any succeeding LF */
++      if (SIZE (&bs) && (CHR (&bs) == '\n')) *s++ = SNX (&bs);
++      break;
++    case '\n':
++      *s++ = '\r';              /* insert a CR */
++    default:
++      *s++ = SNX (&bs);         /* copy characters */
++    }
++    *s = '\0';                  /* tie off buffer */
++    *length = s - (char *) LOCAL->buf;   /* calculate length */
++  }
++  close(LOCAL->fd); LOCAL->fd = -1;
++  return LOCAL->buf;
++}
++
++/* maildir parse, fill the elt structure... well not all of it... */
++unsigned long maildir_parse_message(MAILSTREAM *stream, unsigned long msgno,
++				    DirNamesType dirtype)
++{
++  char *b, *s, *t, c;
++  char tmp[MAILTMPLEN];
++  struct stat sbuf;
++  unsigned long i, len;
++  int d, f, r, se, dt;
++  MESSAGECACHE *elt;
++
++  elt = mail_elt (stream,msgno);
++  MSGPATH(tmp, LOCAL->dir, MDFILE(elt), dirtype);
++  if(stat(tmp, &sbuf) == 0)
++     MDSIZE(elt) = sbuf.st_size;
++
++  maildir_get_date(stream, msgno);
++  maildir_getflag(MDFILE(elt), &d, &f, &r ,&se, &dt);
++  elt->draft = d; elt->flagged = f; elt->answered = r; elt->seen = se;
++  elt->deleted = dt; elt->valid  = T;
++  if (LOCAL->fd < 0)	/* if file closed ? */
++     LOCAL->fd = open(tmp,O_RDONLY,NIL);
++
++  if (LOCAL->fd >= 0){
++	s = (char *) fs_get (MDSIZE(elt) + 1);
++	read (LOCAL->fd,s,MDSIZE(elt));
++	s[MDSIZE(elt)] = '\0';
++	t = s + strlen(s);	/* make t point to the end of s */
++	for (i = 0L, b = s; b < t && !(i && (*b == '\n')); i = (*b++ == '\n'));
++	len = (*b ? ++b : b) - s;
++	elt->private.msg.header.text.size = 
++		elt->private.msg.text.offset = len;
++	elt->private.msg.text.text.size = MDSIZE(elt) - len;
++	for (i = 0L, b = s, c = *b; b &&
++	    ((c < '\016' && ((c == '\012' && ++i) 
++			 ||(c == '\015' && *(b+1) == '\012' && ++b && (i +=2))))
++	    || b < t); i++, c= *++b);
++	elt->rfc822_size = i;
++	fs_give ((void **) &s);
++	close(LOCAL->fd); LOCAL->fd = -1;
++  }
++  return elt->rfc822_size;
++}
++
++int
++maildir_update_elt_maildirp(MAILSTREAM *stream, unsigned long msgno)
++{
++     char tmp[MAILTMPLEN];
++     struct direct **names = NIL;
++     unsigned long i, nfiles, pos;
++     int d = 0, f = 0 , r = 0, s = 0, t = 0, in_list, scan_err;
++     MESSAGECACHE *elt;
++
++     MDFLD(tmp, LOCAL->dir, Cur);
++
++     maildir_scandir (tmp, &names, &nfiles, &scan_err, CCLIENT);
++
++     elt = mail_elt (stream,msgno);
++
++     in_list = nfiles > 0L
++	    ? maildir_message_in_list(MDFILE(elt), names, 0L, nfiles - 1L, &pos)
++	    : NIL;
++
++     if (in_list && pos >= 0L && pos < nfiles
++	 && !strcmp(MDFILE(elt), names[pos]->d_name)){
++	in_list = NIL;
++	maildir_abort(stream);
++     }
++
++     if (in_list && pos >= 0L && pos < nfiles){
++	maildir_free_file_only((void **)&elt->private.spare.ptr);
++	MDFILE(elt) = cpystr(names[pos]->d_name);
++	maildir_getflag(MDFILE(elt), &d, &f, &r ,&s, &t);
++	if (elt->draft != d || elt->flagged != f || 
++	   elt->answered != r || elt->seen != s || elt->deleted != t){
++	   elt->draft = d; elt->flagged = f; elt->answered = r;
++	   elt->seen  = s; elt->deleted = t;
++	   MM_FLAGS(stream, msgno);
++        }
++     }
++     for (i = 0L; i < nfiles; i++)
++	fs_give((void **) &names[i]);
++     if (names)
++	fs_give((void **) &names);
++     return in_list ? 1 : -1;
++}
++
++/* Maildir fetch message header */
++
++char *maildir_header (MAILSTREAM *stream,unsigned long msgno,
++		unsigned long *length, long flags)
++{
++  char tmp[MAILTMPLEN], *s;
++  MESSAGECACHE *elt;
++  static int try = 0;
++
++  if (length) *length = 0;
++  if (flags & FT_UID || !LOCAL) return "";	/* UID call "impossible" */
++  elt = mail_elt (stream,msgno);
++  if(elt->private.msg.header.text.size == 0)
++     maildir_parse_message(stream, msgno, MDLOC(elt));
++
++  MSGPATH(tmp, LOCAL->dir, MDFILE(elt), MDLOC(elt));
++  if (LOCAL->fd < 0)
++     LOCAL->fd = open (tmp,O_RDONLY,NIL);
++
++  if (LOCAL->fd < 0 && errno == EACCES){
++     mm_log ("Message exists but can not be read. Envelope and body lost!",ERROR);
++     return NULL;
++  }
++
++  if (LOCAL->fd < 0){			/* flag change? */
++      if (try < 5){
++	try++;
++	if (maildir_update_elt_maildirp(stream, msgno) > 0)
++	  try = 0;
++	return maildir_header(stream, msgno, length, flags);
++      }
++      try = 0;
++      return NULL;
++  }
++
++  if ((flags & FT_INTERNAL) &&
++        (elt->private.msg.header.text.size > LOCAL->buflen)){
++         fs_give ((void **) &LOCAL->buf);
++         LOCAL->buf = (char *) fs_get ((LOCAL->buflen =
++                                 elt->private.msg.header.text.size) + 1);
++  }
++  else
++      s = (char *) fs_get(elt->private.msg.header.text.size+1);
++  if (LOCAL->fd >= 0){
++     read (LOCAL->fd, ((flags & FT_INTERNAL) ? (void *)LOCAL->buf : (void *)s),
++                                      elt->private.msg.header.text.size);
++     if (flags & FT_INTERNAL)
++        LOCAL->buf[*length = elt->private.msg.header.text.size] = '\0';
++     else{
++        s[*length = elt->private.msg.header.text.size] = '\0';
++        *length = strcrlfcpy (&LOCAL->buf,&LOCAL->buflen,s,
++                          elt->private.msg.header.text.size);
++        fs_give ((void **) &s);
++     }
++  }
++  elt->private.msg.text.offset = elt->private.msg.header.text.size;
++  elt->private.msg.text.text.size = MDSIZE(elt) - elt->private.msg.text.offset;
++  if(s) fs_give((void **)&s);
++  close(LOCAL->fd); LOCAL->fd = -1;
++  return LOCAL->buf;
++}
++
++/* Maildir find list of subscribed mailboxes
++ * Accepts: mail stream
++ *	    pattern to search
++ */
++
++void maildir_list (MAILSTREAM *stream,char *ref, char *pat)
++{
++  char *s,test[MAILTMPLEN],file[MAILTMPLEN];
++  long i = 0L;
++
++  if((!pat || !*pat) && maildir_canonicalize (test,ref,"*")
++	&& maildir_valid_name(test)){	/* there is a #md/ leading here */
++    for (i = 3L; test[i] && test[i] != '/'; i++);
++    if ((s = strchr (test+i+1,'/')) != NULL) *++s = '\0';
++    else test[0] = '\0';
++    mm_list (stream,'/',test, LATT_NOSELECT);
++  }
++  else if (maildir_canonicalize (test,ref,pat)) {
++    if (test[3] == '/') {       /* looking down levels? */
++                                /* yes, found any wildcards? */
++      if ((s = strpbrk (test,"%*")) != NULL){
++                                /* yes, copy name up to that point */
++        strncpy (file,test+4,i = s - (test+4));
++        file[i] = '\0';         /* tie off */
++      }
++      else strcpy (file,test+4);/* use just that name then */
++                                /* find directory name */
++      if ((s = strrchr (file, '/')) != NULL){
++        *s = '\0';              /* found, tie off at that point */
++        s = file;
++      }
++                                /* do the work */
++      if(IS_COURIER(test))
++	courier_list_work (stream,s,test,0);
++      else
++	maildir_list_work (stream,s,test,0);
++    }
++                                /* always an INBOX */
++    if (!compare_cstring (test,"#MD/INBOX"))
++      mm_list (stream,NIL,"#MD/INBOX",LATT_NOINFERIORS);
++    if (!compare_cstring (test,"#MC/INBOX"))
++      mm_list (stream,NIL,"#MC/INBOX",LATT_NOINFERIORS);
++  }
++}
++
++void courier_list (MAILSTREAM *stream,char *ref, char *pat)
++{
++/* I am too lazy to do anything. Do you care to ask maildir list, please?
++   The real reason why this is a dummy function is because we do not want to
++   see the same folder listed twice. 
++*/
++}
++
++/* For those that want to hide things, we give them a chance to do so */
++void *maildir_parameters (long function, void *value)
++{
++  void *ret = NIL;
++  switch ((int) function) {
++  case SET_MDINBOXPATH:
++    if (myMdInboxDir) fs_give ((void **) &myMdInboxDir);
++    myMdInboxDir = cpystr ((char *) value);
++  case GET_MDINBOXPATH:
++    if (!myMdInboxDir) myMdInboxDir = cpystr("Maildir");
++    ret = (void *) myMdInboxDir;
++    break;
++  case SET_COURIERSTYLE:
++    CourierStyle = (long) value;
++  case GET_COURIERSTYLE:
++    ret = (void *) CourierStyle;
++    break;
++  case GET_DIRFMTTEST:
++    ret = (void *) maildir_dirfmttest;
++    break;
++  default:
++    break;
++  }
++  return ret;
++}
++
++int maildir_create_folder(char *mailbox)
++{
++  char tmp[MAILTMPLEN], err[MAILTMPLEN];
++  int i;
++
++  for (i = Cur; i != EndDir; i++){
++	MDFLD(tmp, mailbox, i);
++	if (mkdir(tmp, 0700) && errno != EEXIST){ /* try to make new dir */
++	    sprintf (err, "Can't create %s: %s", tmp, strerror(errno));
++	    mm_log (err,ERROR);
++	    return NIL;
++	}
++  }
++  return T;
++}
++
++int maildir_create_work(char *mailbox, int loop)
++{
++  char *s, c, err[MAILTMPLEN], tmp[MAILTMPLEN], tmp2[MAILTMPLEN], mbx[MAILTMPLEN];
++  int fnlen, create_dir = 0, courier, mv;
++  struct stat sbuf;
++  long style = (long) maildir_parameters(GET_COURIERSTYLE, NIL);
++
++  courier = IS_COURIER(mailbox);
++  strcpy(mbx, mailbox);
++  mv = maildir_valid(mbx) ? 1 : 0;
++  maildir_file_path(mailbox, tmp);
++  if (mailbox[strlen(mailbox) - 1] == MDSEPARATOR(courier)){
++      create_dir++;
++      mailbox[strlen(mailbox) - 1] = '\0';
++  }
++
++  if(!loop && courier){
++    if(mv){
++       if(create_dir){
++	  if(style == CCLIENT)
++	   strcpy (err,"Can not create directory: folder exists. Create subfolder");
++	  else
++	   strcpy(err,"Folder and Directory already exist");
++       }
++       else
++          strcpy (err, "Can't create mailbox: mailbox already exists");
++    }
++    else{
++	if(create_dir)
++	   strcpy(err, "Can not create directory. Cread folder instead");
++	else
++	  err[0] = '\0';
++    }
++    if(err[0]){
++       mm_log (err,ERROR);
++       return NIL;
++    }
++  }
++
++  fnlen = strlen(tmp);
++  if ((s = strrchr(mailbox,MDSEPARATOR(courier))) != NULL){
++     c = *++s;
++    *s = '\0';
++    if ((stat(tmp,&sbuf) || ((sbuf.st_mode & S_IFMT) != S_IFDIR)) &&
++        !maildir_create_work (mailbox, ++loop))
++      return NIL;
++    *s = c;
++  }
++  tmp[fnlen] = '\0';
++
++  if (mkdir(tmp,0700) && errno != EEXIST)
++     return NIL;
++
++  if (create_dir)
++     mailbox[fnlen] = '/';
++
++  if (create_dir){
++     if(style == CCLIENT){
++	if(!courier){
++	   FILE *fp = NULL;
++	   sprintf(tmp2,"%s%s", tmp, MDDIR);
++	   if ((fp = fopen(tmp2,"w")) == NULL){
++	      sprintf (err,"Problem creating %s: %s", tmp2, strerror(errno));
++              mm_log (err,ERROR);
++              return NIL;
++	   }
++	   fclose(fp);
++	}
++     }
++     return T;
++  }
++  else
++     return maildir_create_folder(tmp);
++}
++
++long maildir_create (MAILSTREAM *stream,char *mailbox)
++{
++  char tmp[MAILTMPLEN], err[MAILTMPLEN];
++  int rv, create_dir;
++
++  create_dir = mailbox ? 
++		(mailbox[strlen(mailbox) - 1] == 
++					MDSEPARATOR(IS_COURIER(mailbox))) : 0;
++  maildir_file_path(mailbox, tmp);
++  strcpy(tmp, mailbox);
++  rv = maildir_create_work(mailbox, 0);
++  strcpy(mailbox, tmp);
++  if (rv == 0){
++     sprintf (err,"Can't create %s %s",
++		   (create_dir ? "directory" : "mailbox"), mailbox);
++     mm_log (err,ERROR);
++  }
++  return rv ? LONGT : NIL;
++}
++
++#define MAXTRY 10000
++void maildir_flagmsg (MAILSTREAM *stream,MESSAGECACHE *elt)
++{
++  char oldfile[MAILTMPLEN],newfile[MAILTMPLEN],fn[MAILTMPLEN];
++  char *s;
++  int ren, try = 0;
++
++  if (elt->valid){
++     for (try = 1; try > 0 && try < MAXTRY; try++){
++                                /* build the new filename */
++	sprintf (oldfile,"%s/%s",LOCAL->curdir, MDFILE(elt));
++	fn[0] = '\0';
++	if ((ren = maildir_message_exists(stream, MDFILE(elt), fn)) == 0){
++	    errno = ENOENT;
++	    try = MAXTRY;
++	}
++	if (*fn)	/* new oldfile! */
++	   sprintf (oldfile,"%s/%s",LOCAL->curdir,fn);
++        if ((s = strchr (MDFILE(elt), FLAGSEP))) *s = '\0';
++	sprintf (fn,"%s%s%s%s%s%s%s", MDFILE(elt), MDSEP(2),
++		MDFLAG(Draft, elt->draft), MDFLAG(Flagged, elt->flagged),
++		MDFLAG(Replied, elt->answered), MDFLAG(Seen, elt->seen),
++		MDFLAG(Trashed, elt->deleted));
++	sprintf (newfile,"%s/%s",LOCAL->curdir,fn);
++        if (ren != 0 && rename (oldfile,newfile) >= 0)
++	    try = -1;
++     }
++
++     if (try > 0){
++       sprintf(oldfile,"Unable to write flags to disk: %s",
++		(errno == ENOENT) ? "message is gone!" : strerror (errno));
++       mm_log(oldfile,ERROR);
++       return;
++     }
++#ifdef __CYGWIN__
++     utime(LOCAL->curdir, NIL);	/* make sure next scan will catch the change */
++#endif
++     maildir_free_file_only ((void **) &elt->private.spare.ptr);
++     MDFILE(elt) = cpystr (fn);
++  }
++}
++
++long maildir_expunge (MAILSTREAM *stream, char *sequence, long options)
++{
++  long ret;
++  MESSAGECACHE *elt;
++  unsigned long i, n = 0L;
++  unsigned long recent = stream->recent;
++  char tmp[MAILTMPLEN];
++
++  mm_critical (stream);               /* go critical */
++  ret = sequence ? ((options & EX_UID) ?
++                         mail_uid_sequence (stream,sequence) :
++                         mail_sequence (stream,sequence)) : LONGT;
++  if(ret == 0L)
++     return 0L;
++  for (i = 1L; i <= stream->nmsgs;){
++    elt = mail_elt (stream,i);
++    if (elt->deleted && (sequence ? elt->sequence : T)){
++      sprintf (tmp,"%s/%s",LOCAL->curdir, MDFILE(elt));
++      if (unlink (tmp) < 0) {/* try to delete the message */
++      sprintf (tmp,"Expunge of message %ld failed, aborted: %s",i,
++              strerror (errno));
++      if (!stream->silent)
++         mm_log (tmp,WARN);
++      break;
++      }
++      if (elt->private.spare.ptr)
++       maildir_free_file ((void **) &elt->private.spare.ptr);
++      if (elt->recent) --recent;/* if recent, note one less recent message */
++      mail_expunged (stream,i);       /* notify upper levels */
++       n++;                    /* count up one more expunged message */
++    }
++    else i++;
++  }
++  if(n){                      /* output the news if any expunged */
++    sprintf (tmp,"Expunged %ld messages",n);
++    if (!stream->silent)
++       mm_log (tmp,(long) NIL);
++  }
++  else
++    if (!stream->silent)
++      mm_log ("No messages deleted, so no update needed",(long) NIL);
++  mm_nocritical (stream);     /* release critical */
++                            /* notify upper level of new mailbox size */
++  mail_exists (stream,stream->nmsgs);
++  mail_recent (stream,recent);
++  return ret;
++}
++
++long maildir_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
++{
++  STRING st;
++  MESSAGECACHE *elt;
++  unsigned long len;
++  int fd;
++  unsigned long i;
++  struct stat sbuf;
++  char tmp[MAILTMPLEN], flags[MAILTMPLEN], path[MAILTMPLEN], *s;
++				/* copy the messages */
++  if ((options & CP_UID) ? mail_uid_sequence (stream, sequence) : 
++  	mail_sequence (stream,sequence)) 
++  for (i = 1L; i <= stream->nmsgs; i++)
++    if ((elt = mail_elt (stream,i))->sequence){
++      MSGPATH(path, LOCAL->dir, MDFILE(elt), MDLOC(elt));
++      if (((fd = open (path,O_RDONLY,NIL)) < 0)	 
++	  ||((!elt->rfc822_size && 
++		((stat(path, &sbuf) < 0) || !S_ISREG (sbuf.st_mode)))))
++	return NIL;
++	if(!elt->rfc822_size)
++	  MDSIZE(elt) = sbuf.st_size;
++        s = (char *) fs_get(MDSIZE(elt) + 1);
++        read (fd,s,MDSIZE(elt));
++        s[MDSIZE(elt)] = '\0';
++        close (fd);
++	len = strcrlfcpy (&LOCAL->buf,&LOCAL->buflen, s, MDSIZE(elt));
++        INIT (&st,mail_string, LOCAL->buf, len);
++	elt->rfc822_size = len;
++	fs_give ((void **)&s);
++
++      flags[0] = flags[1] = '\0';
++      if (elt->seen) strcat (flags," \\Seen");
++      if (elt->draft) strcat (flags," \\Draft");
++      if (elt->deleted) strcat (flags," \\Deleted");
++      if (elt->flagged) strcat (flags," \\Flagged");
++      if (elt->answered) strcat (flags," \\Answered");
++      flags[0] = '(';         /* open list */
++      strcat (flags,")");     /* close list */
++      mail_date (tmp,elt);	/* generate internal date */
++      if (!mail_append_full (NIL,mailbox,flags,tmp,&st))
++        return NIL;
++      if (options & CP_MOVE) elt->deleted = T;
++    }
++  return LONGT;			/* return success */
++}
++
++long maildir_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
++{
++  int fd;
++  STRING *message;
++  char c,*s, *flags, *date;
++  char tmp[MAILTMPLEN],file[MAILTMPLEN],path1[MAILTMPLEN],path2[MAILTMPLEN];
++  MESSAGECACHE elt;
++  long i, size = 0L, ret = LONGT, f;
++  unsigned long uf;
++  static unsigned int transact = 0;
++
++  if (!maildir_valid(mailbox)) {
++    sprintf (tmp,"Not a valid Maildir mailbox: %s",mailbox);
++    mm_log (tmp,ERROR);
++    return NIL;
++  }
++
++ if (!*mdlocaldomain)
++     md_domain_name();    /* get domain name for maildir files in mdlocaldomain now! */
++
++  if (!(*af) (stream,data,&flags,&date,&message)) return NIL;
++
++  mm_critical (stream);		/* go critical */
++  do {
++    if (!SIZE (message)) {      /* guard against zero-length */
++      mm_log ("Append of zero-length message",ERROR);
++      ret = NIL;
++      break;
++    }
++    if (date && !mail_parse_date(&elt,date)){
++        sprintf (tmp,"Bad date in append: %.80s",date);
++        mm_log (tmp,ERROR);
++        ret = NIL;
++        break;
++    }
++    f = mail_parse_flags (stream,flags,&uf);
++				/* build file name we will use */
++    sprintf (file,"%lu.%d_%09u.%s%s%s%s%s%s",
++	   time (0),getpid (),transact++,mdlocaldomain, (f ? MDSEP(2) : ""),
++		MDFLAG(Draft, f&fDRAFT), MDFLAG(Flagged, f&fFLAGGED),
++		MDFLAG(Replied, f&fANSWERED), MDFLAG(Seen, f&fSEEN));
++				/* build tmp file name */
++    if (maildir_file_path(mailbox, tmp))
++       MSGPATH(path1, tmp, file, Tmp);
++
++    if ((fd = open (path1,O_WRONLY|O_CREAT|O_EXCL,S_IREAD|S_IWRITE)) < 0) {
++       sprintf (tmp,"Can't open append mailbox: %s",strerror (errno));
++       mm_log (tmp,ERROR);
++       return NIL;
++    }
++    for (size = 0,i = SIZE (message),s = (char *) fs_get (i + 1); i; --i)
++      if ((c = SNX (message)) != '\015') s[size++] = c;
++    if ((write (fd,s,size) < 0) || fsync (fd)) {
++	unlink (path1);		/* delete message */
++	sprintf (tmp,"Message append failed: %s",strerror (errno));
++	mm_log (tmp,ERROR);
++	ret = NIL;
++    }
++    fs_give ((void **) &s);	/* flush the buffer */
++    close (fd);			/* close the file */
++				/* build final filename to use */
++    if (maildir_file_path(mailbox, tmp))
++	MSGPATH(path2, tmp, file, New);
++    if (link (path1,path2) < 0) {
++       sprintf (tmp,"Message append failed: %s",strerror (errno));
++       mm_log (tmp,ERROR);
++       ret = NIL;
++    }
++    unlink (path1);
++
++    if (ret)
++     if (!(*af) (stream,data,&flags,&date,&message)) ret = NIL;
++
++  } while (ret && message);	/* write the data */
++  
++  mm_nocritical (stream);	/* release critical */
++  return ret;
++}
++
++long maildir_delete (MAILSTREAM *stream,char *mailbox)
++{
++  DIR *dirp;
++  struct direct *d;
++  int i, remove_dir = 0, mddir = 0, rv, error = 0;
++  char tmp[MAILTMPLEN],tmp2[MAILTMPLEN], realname[MAILTMPLEN];
++  struct stat sbuf;
++  int courier = IS_COURIER(mailbox);
++
++  if (mailbox[strlen(mailbox) - 1] == MDSEPARATOR(courier)){
++      remove_dir++;
++      mailbox[strlen(mailbox) -1] = '\0';
++  }
++
++  if (!maildir_valid(mailbox)){
++      maildir_file_path(mailbox, tmp);
++      if (stat(tmp, &sbuf) < 0 || !S_ISDIR(sbuf.st_mode)){
++        sprintf(tmp,"Can not remove %s", mailbox);
++	error++;
++      }
++  }
++
++  if (!error && remove_dir && !maildir_dir_is_empty(mailbox)){
++     sprintf(tmp,"Can not remove directory %s/: directory not empty", mailbox);
++     error++;
++  }
++
++  if(error){
++     mm_log (tmp,ERROR);
++     return NIL;
++  }
++
++  maildir_close(stream,0);	/* even if stream was NULL */
++
++  maildir_file_path(mailbox, realname);
++
++  if (remove_dir){
++     sprintf(tmp,"%s/%s", realname, MDDIR);
++     if ((rv = stat (tmp,&sbuf)) == 0 && S_ISREG(sbuf.st_mode))
++	rv = unlink(tmp);
++     else if (errno == ENOENT)
++	rv = 0;
++     if (rv != 0){
++	sprintf(tmp,"Can not remove %s/%s: %s", tmp2, MDDIR, strerror(errno));
++	mm_log (tmp,ERROR);
++	return NIL;
++     }
++     if (!maildir_valid(realname) && rmdir(realname) != 0){
++	sprintf(tmp,"Can not remove %s/: %s", mailbox, strerror(errno));
++	mm_log (tmp,ERROR);
++	return NIL;
++     }
++     return LONGT;
++  }
++  /* else remove just the folder. Remove all hidden files, except MDDIR */
++  for (i = Cur; i != EndDir; i++){
++      MDFLD(tmp, realname, i);
++
++      if (!(dirp = opendir (tmp))){
++	  sprintf(tmp,"Can not read %s/: %s", mailbox, strerror(errno));
++	  mm_log (tmp,ERROR);
++	  return NIL;
++      }
++
++      while ((d = readdir(dirp)) != NULL){
++	 if (strcmp(d->d_name, ".") && strcmp(d->d_name,"..")){
++	    sprintf(tmp2,"%s/%s", tmp, d->d_name);
++	    if (unlink(tmp2) != 0){
++	       sprintf(tmp2,"Can not remove %s: %s", mailbox, strerror(errno));
++	       mm_log (tmp2,ERROR);
++	       return NIL;
++	    }
++	 }
++      }
++      closedir(dirp);
++      if (rmdir(tmp) != 0){
++	 sprintf(tmp,"Can not remove %s: %s", mailbox, strerror(errno));
++	 mm_log (tmp,ERROR);
++	 return NIL;
++      }
++  }
++  /* 
++   * ok we have removed all subdirectories of the folder mailbox, Remove the
++   * hidden files.
++   */
++
++  if(!(dirp = opendir (realname))){
++    sprintf(tmp,"Can not read %s/: %s", realname, strerror(errno));
++    mm_log (tmp,ERROR);
++    return NIL;
++  }
++
++  while ((d = readdir(dirp)) != NULL){
++	if (strcmp(d->d_name, ".") && strcmp(d->d_name,"..")
++		&& !strcmp(d->d_name, MDDIR)){
++	   sprintf(tmp,"%s/%s", realname, d->d_name);
++	   mddir++;
++	   if (unlink(tmp) != 0)
++	      error++;
++	}
++  }
++  closedir(dirp);
++  if (error || 
++	 (maildir_dir_is_empty(mailbox) && mddir == 0 && rmdir(realname) < 0)){
++        sprintf(tmp,"Can not remove folder %s: %s", mailbox, strerror(errno));
++        mm_log (tmp,ERROR);
++        return NIL;
++  }
++  return LONGT;
++}
++
++long maildir_rename (MAILSTREAM *stream, char *old, char *new)
++{
++  char tmp[MAILTMPLEN],tmpnew[MAILTMPLEN], realold[MAILTMPLEN];
++  char realnew[MAILTMPLEN];
++  int courier = IS_COURIER(old) && IS_COURIER(new);
++  int i;
++  long rv = LONGT;
++  COURIER_S *cdir;
++
++  if((IS_COURIER(old) || IS_COURIER(new)) && !courier){
++    sprintf (tmp,"Can't rename mailbox %s to %s",old, new);
++    mm_log (tmp,ERROR);
++    return NIL;
++  }
++
++  if (!maildir_valid(old)){
++    sprintf (tmp,"Can't rename mailbox %s: folder not in maildir format",old);
++    mm_log (tmp,ERROR);
++    return NIL;
++  }
++  maildir_file_path(old, realold);
++  if (!maildir_valid_name(new) && new[0] == '#'){
++    sprintf (tmp,"Can't rename mailbox %s: folder not in maildir format",new);
++    mm_log (tmp,ERROR);
++    return NIL;
++  }
++  maildir_file_path(new, realnew);
++  if (access(tmpnew,F_OK) == 0){ 	/* new mailbox name must not exist */
++    sprintf (tmp,"Can't rename to mailbox %s: destination already exists",new);
++    mm_log (tmp,ERROR);
++    return NIL;
++  }
++
++  if(!courier){
++    if (rename (realold,realnew)){	/* try to rename the directory */
++       sprintf (tmp,"Can't rename mailbox %s to %s: %s",old, new,
++							strerror(errno));
++       mm_log (tmp,ERROR);
++       return NIL;
++    }
++    return LONGT;	/* return success */
++  }
++
++  cdir = courier_list_dir(old);
++  for (i = 0; cdir && i < cdir->total; i++){
++      if(strstr(cdir->data[i]->name, old)){
++	sprintf(tmp,"%s%s", new, cdir->data[i]->name+strlen(old));
++	maildir_file_path(cdir->data[i]->name, realold);
++	maildir_file_path(tmp, realnew);
++	if (rename (realold,realnew)){
++	   sprintf (tmp,"Can't rename mailbox %s to %s: %s",old, new,
++							strerror(errno));
++	   mm_log (tmp,ERROR);
++	   rv = NIL;
++	}
++    }
++  }
++  courier_free_cdir(&cdir);
++  return rv;
++}
++
++long maildir_sub (MAILSTREAM *stream,char *mailbox)
++{
++  return sm_subscribe (mailbox);
++}
++
++long maildir_unsub (MAILSTREAM *stream,char *mailbox)
++{
++  return sm_unsubscribe (mailbox);
++}
++
++void maildir_lsub (MAILSTREAM *stream,char *ref,char *pat)
++{
++  void *sdb = NIL;
++  char *s, 	test[MAILTMPLEN];
++                                /* get canonical form of name */
++  if (maildir_canonicalize (test,ref,pat) && (s = sm_read (&sdb))) {
++    do if (pmatch_full (s,test,'/')) mm_lsub (stream,'/',s,NIL);
++    while ((s = sm_read (&sdb)) != NULL); /* until no more subscriptions */
++  }
++}
++
++long maildir_canonicalize (char *pattern,char *ref,char *pat)
++{
++  if (ref && *ref) {            /* have a reference */
++    strcpy (pattern,ref);       /* copy reference to pattern */
++                                /* # overrides mailbox field in reference */
++    if (*pat == '#') strcpy (pattern,pat);
++                                /* pattern starts, reference ends, with / */
++    else if ((*pat == '/') && (pattern[strlen (pattern) - 1] == '/'))
++      strcat (pattern,pat + 1); /* append, omitting one of the period */
++                                                                                
++    else strcat (pattern,pat);  /* anything else is just appended */
++  }
++  else strcpy (pattern,pat);    /* just have basic name */
++  return maildir_valid_name(pattern) ? LONGT : NIL;
++}
++
++void maildir_list_work (MAILSTREAM *stream,char *dir,char *pat,long level)
++{
++  DIR *dp;
++  struct direct *d;
++  struct stat sbuf;
++  char curdir[MAILTMPLEN],name[MAILTMPLEN], tmp[MAILTMPLEN];
++  char realpat[MAILTMPLEN];
++  long i;
++  char *maildirpath = mdirpath();
++
++  sprintf(curdir,"%s/%s/", myrootdir(pat), dir ? dir : maildirpath);
++  if ((dp = opendir (curdir)) != NULL){ 
++     if (dir) sprintf (name,"%s%s/",MDPREFIX(CCLIENT),dir);
++     else strcpy (name, pat);
++
++     if (level == 0 && !strpbrk(pat,"%*")){
++	if(maildir_valid(pat)){
++	  i =  maildir_contains_folder(pat, NULL)
++		? LATT_HASCHILDREN
++		: (maildir_is_dir(pat, NULL)
++			     ? LATT_HASNOCHILDREN : LATT_NOINFERIORS);
++	  maildir_file_path(pat, realpat);
++	  i +=  maildir_any_new_msgs(realpat) 
++			? LATT_MARKED : LATT_UNMARKED;
++	  mm_list (stream,'/', pat, i);
++	}
++	else
++	   if(pat[strlen(pat) - 1] == '/')
++	     mm_list (stream,'/', pat, LATT_NOSELECT);
++     }
++
++     while ((d = readdir (dp)) != NULL)
++	if(strcmp(d->d_name, ".") && strcmp(d->d_name,"..")
++		&& strcmp(d->d_name, MDNAME(Cur)) 
++		&& strcmp(d->d_name, MDNAME(Tmp)) 
++		&& strcmp(d->d_name, MDNAME(New))){
++
++	  if (dir) sprintf (tmp,"%s%s", name,d->d_name);
++	  else strcpy(tmp, d->d_name);
++
++	  if(pmatch_full (tmp, pat,'/')){
++	     sprintf(tmp,"%s/%s/%s", myrootdir(d->d_name), 
++				(dir ? dir : maildirpath), d->d_name);
++	     if(stat (tmp,&sbuf) == 0 
++		   && ((sbuf.st_mode & S_IFMT) == S_IFDIR)){
++	       if (dir) sprintf (tmp,"%s%s", name,d->d_name);
++	       else strcpy(tmp, d->d_name);
++               i = maildir_valid(tmp)
++			? (maildir_contains_folder(dir, d->d_name)
++			  ? LATT_HASCHILDREN
++			  : (maildir_is_dir(dir, d->d_name)
++			     ? LATT_HASNOCHILDREN : LATT_NOINFERIORS))
++			: LATT_NOSELECT;
++	       i +=  maildir_any_new_msgs(tmp)
++			    ? LATT_MARKED : LATT_UNMARKED;
++	       mm_list (stream,'/',tmp, i);
++	       strcat (tmp, "/");
++	       if(dmatch (tmp, pat,'/') &&
++                 (level < (long) mail_parameters (NIL,GET_LISTMAXLEVEL,NIL))){
++		   sprintf(tmp,"%s/%s",dir,d->d_name);
++ 		   maildir_list_work (stream,tmp,pat,level+1);
++	       }
++	     }
++	  }
++       }
++     closedir (dp);
++  }
++}
++
++void courier_list_work (MAILSTREAM *stream, char *dir, char *pat, long level)
++{
++  char c, curdir[MAILTMPLEN], tmp[MAILTMPLEN];
++  char realname[MAILTMPLEN], realpat[MAILTMPLEN] = {'\0'};
++  int i, found;
++  long style = (long) maildir_parameters(GET_COURIERSTYLE, NIL), j;
++  char *maildirpath = mdirpath();
++  COURIER_S *cdir;
++
++  if(!strpbrk(pat,"%*")){	/* a mailbox */
++     maildir_file_path(pat, curdir);
++     i = strlen(curdir) - 1;
++     if(curdir[i] == '/')
++       curdir[i] = '\0';
++     cdir = courier_list_dir(curdir);
++     if(cdir){
++	found = 0; j = 0L;
++	if(maildir_valid_name(pat)){
++	  for(i = 0; !found && i < cdir->total; i++)
++	     if(strstr(curdir, cdir->data[i]->name)){
++		if(strlen(curdir) < strlen(cdir->data[i]->name))
++		  found += 2;
++		else if(strlen(curdir) == strlen(cdir->data[i]->name))
++		  found -= 1;
++	     }
++	  if(found > 0)
++            j = LATT_HASCHILDREN;
++          else if(found == 0)
++	    j = (style == COURIER) ? LATT_HASNOCHILDREN : LATT_NOINFERIORS;
++	}
++	else
++	   j = LATT_NOSELECT;
++        j += maildir_any_new_msgs(curdir) ? LATT_MARKED : LATT_UNMARKED;
++	if (found)
++	   mm_list (stream, '.', pat, j);
++        courier_free_cdir(&cdir);
++     }
++     return;
++  }
++
++  strcpy(tmp,pat + 4);	/* a directory */
++  j = strlen(pat) - 1;
++  maildir_file_path(pat, realpat);
++  c = pat[j];
++  pat[j] = '\0';
++  realname[0] = '\0';
++  if(dir)
++    maildir_file_path(dir, realname);
++  sprintf(curdir,"%s%s%s/%s", (dir ? "" : myrootdir(pat)), (dir ? "" : "/"),
++		(dir ? realname : maildirpath),	(dir ? "" : "."));
++  sprintf(tmp, "%s%s/.", MDPREFIX(COURIER), dir ? dir : maildirpath);
++  if (level == 0 && tmp && pmatch_full (tmp, realpat, '.'))
++     mm_list (stream,'.', tmp, LATT_NOSELECT);
++
++  cdir = courier_list_dir(pat);
++  pat[j] = c;
++  for (i = 0; cdir && i < cdir->total; i++)
++   if(pmatch_full (cdir->data[i]->name, pat, '.')){
++      sprintf(tmp, "%s.", cdir->data[i]->name);
++      courier_list_info(&cdir, tmp, i);
++      mm_list (stream,'.',cdir->data[i]->name, cdir->data[i]->attribute);
++   }
++  courier_free_cdir(&cdir);
++}
++
++int 
++same_maildir_file(char *name1, char *name2)
++{
++ char tmp1[MAILTMPLEN], tmp2[MAILTMPLEN];
++ char *s;
++
++ strcpy(tmp1, name1 ? name1 : "");
++ strcpy(tmp2, name2 ? name2 : "");
++ if ((s = strchr(tmp1, FLAGSEP)) != NULL)
++   *s = '\0';
++ if (((s = strrchr(tmp1, SIZESEP)) != NULL) && (strchr(s,'.') == NULL))
++   *s = '\0';
++ if ((s = strchr(tmp2, FLAGSEP)) != NULL)
++   *s = '\0';
++ if (((s = strrchr(tmp2, SIZESEP)) != NULL) && (strchr(s,'.') == NULL))
++   *s = '\0';
++
++ return !strcmp(tmp1, tmp2);
++}
++
++unsigned long antoul(char *seed)
++{
++  int i, error = 0;
++  unsigned long val = 0L, rv1 = 0L, t;
++  char c, *p;
++ if(!seed)
++   return 0L;
++ t = strtoul(seed, &p, 10);
++ if(p && (*p == '.' || *p == '_'))
++   return t;
++ /* else */
++ if((p = strchr(seed,'.')) != NULL)
++   *p = '\0';
++ error = (strlen(seed) > 6); /* too long */
++ for(i= strlen(seed)-1; error == 0 && i >= 0; i--){
++    c = seed[i];
++    if (c >= 'A' && c <= 'Z') val = c - 'A';
++    else if (c >= 'a' && c <= 'z') val = c - 'a' + 26;
++    else if (c >= '0' && c <= '9') val = c - '0' + 26 + 26; 
++    else if (c == '-') val = c - '-' + 26 + 26 + 10;
++    else if (c == '_') val = c - '_' + 26 + 26 + 10 + 1;
++    else error++;
++    rv1 = val + (rv1 << 6);
++ }
++ if(p)
++   *p = '.';
++  return error ? 0L : rv1;
++}
++
++unsigned long mdfntoul (char *name)
++{
++  unsigned long t;
++  char *r, last;
++
++  if((*name == '_') && ((r = strpbrk(name,".,%+")) != NULL)){ /* Grrr!!! */
++    last = *r;
++    *r = '\0';
++     t = antoul(r+1);
++    *r = last;
++  }
++  else
++    t = antoul(name);
++  return t;
++}
++
++int comp_maildir_file(char *name1, char *name2)
++{
++  int uset1 = 1, uset2 = 1, i, j, cmp;
++  unsigned long t1, t2;
++  char *s1, *s2;
++
++  if (!(name1 && *name1))
++     return (name2 && *name2) ? (*name2 == FLAGSEP ? 0 : -1) : 0;
++
++  if (!(name2 && *name2))
++     return (name1 && *name1) ? (*name1 == FLAGSEP ? 0 : 1) : 0;
++
++   if((cmp = strcmp(name1,name2)) == 0)
++      return 0;
++
++  t1 = strtoul(name1, &s1, 10);
++  t2 = strtoul(name2, &s2, 10);
++
++  if(!s1 || *s1 != '.')
++    uset1 = 0;
++
++  if(!s2 || *s2 != '.')
++    uset2 = 0;
++
++  if(uset1 && uset2)	/* normal sort order */
++    return (t1 < t2) ? -1 : (t1 > t2 ? 1 : (cmp < 0 ? -1 : 1));
++
++  /* If we make it here we say Grrrr.... first, then we try to figure out
++   * how to sort this mess.
++   * These are the rules.
++   * If there is a number at the beginning it is bigger than anything else.
++   * If there are digits, then the number of digits decides which one is bigger.
++   */
++
++  for(i = 0; isdigit(name1[i]); i++);
++  for(j = 0; isdigit(name2[j]); j++);
++
++  return(uset1 ? 1 
++	       : (uset2 ? -1 
++			: (i < j ? -1 : (i > j ? 1 : (cmp < 0 ? -1 : 1)))));
++}
++
++void
++maildir_getflag(char *name, int *d, int *f, int *r ,int *s, int *t)
++{
++  char tmp[MAILTMPLEN], *b;
++  int offset = 0;
++  int tmpd, tmpf, tmpr, tmps, tmpt;
++
++  if(d) *d = 0;
++  if(f) *f = 0;
++  if(r) *r = 0;
++  if(s) *s = 0;
++  if(t) *t = 0;
++
++  tmpd = tmpf = tmpr = tmps = tmpt = NIL; /* no flags set by default */
++  strcpy(tmp,name);
++  while ((b = strchr(tmp+offset, FLAGSEP)) != NULL){
++    char flag,last;
++    int  k;
++    if (!++b) break;
++    switch (*b){
++	case '1':
++	case '2':
++	case '3': flag = *b; b += 2;
++		  for (k = 0; b[k] && b[k] != FLAGSEP && b[k] != ','; k++);
++		  last = b[k];
++		  b[k] = '\0';
++		  if (flag == '2' || flag == '3'){
++		     tmpd = strchr (b, MDFLAGC(Draft))   ? T : NIL;
++		     tmpf = strchr (b, MDFLAGC(Flagged)) ? T : NIL;
++		     tmpr = strchr (b, MDFLAGC(Replied)) ? T : NIL;
++		     tmps = strchr (b, MDFLAGC(Seen))    ? T : NIL;
++		     tmpt = strchr (b, MDFLAGC(Trashed)) ? T : NIL;
++		  }
++		  b[k] = last;
++		  b += k;
++		  for (; tmp[offset] && tmp[offset] != FLAGSEP; offset++);
++		  offset++;
++		break;
++	default: break;	/* Should we crash?... Nahhh */
++    }
++  }
++  if(d) *d = tmpd;
++  if(f) *f = tmpf;
++  if(r) *r = tmpr;
++  if(s) *s = tmps;
++  if(t) *t = tmpt;
++}
++
++int
++maildir_message_in_list(char *msgname, struct direct **names, 
++		unsigned long bottom, unsigned long top, unsigned long *pos)
++{
++  unsigned long middle = (bottom + top)/2;
++  int test;
++
++  if (!msgname)
++     return NIL;
++
++  if (pos) *pos = middle;
++
++  if (same_maildir_file(msgname, names[middle]->d_name))
++     return T;
++
++  if (middle == bottom){	 /* 0 <= 0 < 1 */
++     int rv = NIL;
++     if (same_maildir_file(msgname, names[middle]->d_name)){
++	rv = T;
++	if (pos) *pos = middle;
++     }
++     else
++       if (same_maildir_file(msgname, names[top]->d_name)){
++	rv = T;
++	if (pos) *pos = top;
++       }
++     return rv;
++  }
++
++  test = comp_maildir_file(msgname, names[middle]->d_name);
++
++  if (top <= bottom)
++      return test ? NIL : T;
++
++  if (test < 0 ) /* bottom <  msgname < middle */
++     return maildir_message_in_list(msgname, names, bottom, middle, pos);
++  else if (test > 0)  /* middle < msgname < top */
++     return maildir_message_in_list(msgname, names, middle, top, pos);
++  else return T;
++}
++
++void
++maildir_abort(MAILSTREAM *stream)
++{
++  if (LOCAL){
++    if (LOCAL->dir) fs_give ((void **) &LOCAL->dir);
++    if (LOCAL->curdir) fs_give ((void **) &LOCAL->curdir);
++    if (LOCAL->buf) fs_give ((void **) &LOCAL->buf);
++    fs_give ((void **) &stream->local);
++  }
++  if (mdfpath) fs_give((void **)&mdfpath);
++  stream->dtb = NIL;
++}
++
++int
++maildir_contains_folder(char *dirname, char *name)
++{
++  char tmp[MAILTMPLEN], tmp2[MAILTMPLEN];
++  int rv = 0;
++  DIR *dir;
++  struct direct *d;
++
++  maildir_file_path(dirname, tmp2);
++  if(name){
++    strcat(tmp2,"/");
++    strcat(tmp2, name);
++  }
++
++  if (!(dir = opendir (tmp2)))
++     return NIL;
++
++  while ((d = readdir(dir)) != NULL){
++    if (strcmp(d->d_name, ".") && strcmp(d->d_name,"..")
++	&& strcmp(d->d_name, MDNAME(Cur)) 
++	&& strcmp(d->d_name, MDNAME(Tmp)) 
++	&& strcmp(d->d_name, MDNAME(New))){
++
++       sprintf(tmp,"%s/%s", tmp2, d->d_name);
++       if(maildir_valid(tmp)){
++	  rv++;
++	  break;
++       }
++    }
++  }
++  closedir(dir);
++  return rv;
++}
++
++int
++maildir_is_dir(char *dirname, char *name)
++{
++  char tmp[MAILTMPLEN];
++  struct stat sbuf;
++
++  maildir_file_path(dirname, tmp);
++  if(name){
++    strcat(tmp,"/");
++    strcat(tmp,name);
++  }
++  strcat(tmp,"/");
++  strcat(tmp,MDDIR);
++
++  return ((stat(tmp, &sbuf) == 0) && S_ISREG (sbuf.st_mode)) ? 1 : 0;
++}
++
++int
++maildir_dir_is_empty(char *mailbox)
++{
++  char tmp[MAILTMPLEN], tmp2[MAILTMPLEN];
++  int rv = 1;
++  DIR *dir;
++  struct direct *d;
++  struct stat sbuf;
++
++  maildir_file_path(mailbox, tmp2);
++
++  if (!(dir = opendir (tmp2)))
++     return rv;
++
++  while ((d = readdir(dir)) != NULL){
++    sprintf(tmp,"%s/%s", tmp2, d->d_name);
++    if (strcmp(d->d_name, ".") 
++	&& strcmp(d->d_name,"..")
++	&& strcmp(d->d_name, MDNAME(Cur)) 
++	&& strcmp(d->d_name, MDNAME(Tmp)) 
++	&& strcmp(d->d_name, MDNAME(New))
++	&& strcmp(d->d_name, MDDIR)
++	&& strcmp(d->d_name, MDUIDVALIDITY)
++	&& !(d->d_name[0] == '.' 
++		&& stat (tmp,&sbuf) == 0 
++		&& S_ISREG(sbuf.st_mode))){
++	   rv = 0;
++	   break;
++       }
++  }
++  closedir(dir);
++  return rv;
++}
++
++void
++maildir_get_file (MAILDIRFILE **mdfile)
++{
++  MAILDIRFILE *md;
++
++  md = (MAILDIRFILE *) fs_get(sizeof(MAILDIRFILE));
++  memset(md, 0, sizeof(MAILDIRFILE));
++  *mdfile = md;
++}
++
++void
++maildir_free_file (void **mdfile)
++{
++  MAILDIRFILE *md = (mdfile && *mdfile) ? (MAILDIRFILE *) *mdfile : NULL;
++
++  if (md){
++     if (md->name) fs_give((void **)&md->name);
++     fs_give((void **)&md);
++  }
++}
++
++void
++maildir_free_file_only (void **mdfile)
++{
++  MAILDIRFILE *md = (mdfile && *mdfile) ? (MAILDIRFILE *) *mdfile : NULL;
++
++  if (md && md->name) 
++     fs_give((void **)&md->name);
++}
++
++int
++maildir_any_new_msgs(char *mailbox)
++{
++  char tmp[MAILTMPLEN];
++  int rv = NIL;
++  DIR *dir;
++  struct direct *d;
++
++  MDFLD(tmp, mailbox, New);
++
++  if (!(dir = opendir (tmp)))
++     return rv;
++
++  while ((d = readdir(dir)) != NULL){
++    if (d->d_name[0] == '.')
++	continue;
++    rv = T;
++    break;
++  }
++  closedir(dir);
++  return rv;
++}
++
++
++void
++maildir_get_date(MAILSTREAM *stream, unsigned long msgno)
++{
++  MESSAGECACHE *elt;
++  struct tm *t;
++  unsigned long ti;
++  int i,k;
++
++  elt = mail_elt (stream,msgno);
++  if(elt && elt->year != 0)
++    return;
++  if ((ti = mdfntoul(MDFILE(elt))) > 0L && (t = gmtime(&ti))){
++     i = t->tm_hour * 60 + t->tm_min;
++     k = t->tm_yday;
++     t = localtime(&ti);
++     i = t->tm_hour * 60 + t->tm_min - i;
++     if((k = t->tm_yday - k) != 0) 
++	i += ((k < 0) == (abs (k) == 1)) ? -24*60 : 24*60;
++     k = abs (i);
++     elt->hours = t->tm_hour; 
++     elt->minutes = t->tm_min; 
++     elt->seconds = t->tm_sec;
++     elt->day = t->tm_mday; elt->month = t->tm_mon + 1;
++     elt->year = t->tm_year - (BASEYEAR - 1900);
++     elt->zoccident = (k == i) ? 0 : 1;
++     elt->zhours = k/60;
++     elt->zminutes = k % 60;
++  }
++}
++
++/* Support for Courier Style directories 
++   When this code is complete there will be two types of support, which 
++   will be configurable. The problem is the following: In Courier style 
++   folder structure, a "folder" may have a subfolder called 
++   "folder.subfolder", which is not natural in the file system in the 
++   sense that I can not stat for "folder.subfolder" wihtout knowing what 
++   "subfolder" is. It needs to be guessed. Because of this I need to look 
++   in the list of folders if there is a folder with a name 
++   "folder.subfolder", before I can say if the folder is dual or not. One 
++   can avoid this annoyance if one ignores the problem by declaring that 
++   every folder is dual. I will however code as the default the more 
++   complicated idea of scaning the containing directory each time it is 
++   modified and search for subfolders, and list the entries it found.
++ */
++
++int courier_dir_select (const struct direct *name)
++{
++ return name->d_name[0] == '.' && (strlen(name->d_name) > 2
++	|| (strlen(name->d_name) == 2 &&  name->d_name[1] != '.'));
++}
++
++int courier_dir_sort (const void *d1, const  void *d2)
++{
++  const struct direct **e1, **e2;
++
++  e1 = (const struct direct **)d1;
++  e2 = (const struct direct **)d2;
++
++  return strcmp((char*)(*e1)->d_name, (char *)(*e2)->d_name);
++}
++
++void courier_free_cdir (COURIER_S **cdir)
++{
++  int i;
++
++  if (!*cdir)
++     return;
++
++  if ((*cdir)->path) fs_give((void **)&((*cdir)->path));
++  for (i = 0; i < (*cdir)->total; i++)
++    if((*cdir)->data[i]->name) fs_give((void **)&((*cdir)->data[i]->name));
++  fs_give((void **)&((*cdir)->data));
++  fs_give((void **)&(*cdir));
++}
++
++COURIER_S *courier_get_cdir (int total)
++{
++ COURIER_S *cdir;
++
++ cdir = (COURIER_S *)fs_get(sizeof(COURIER_S));
++ memset(cdir, 0, sizeof(COURIER_S));
++ cdir->data = (COURIERLOCAL **) fs_get(total*sizeof(COURIERLOCAL *));
++ memset(cdir->data, 0, sizeof(COURIERLOCAL *));
++ cdir->total = total;
++ return cdir;
++}
++
++int courier_search_list(COURIERLOCAL **data, char *name, int first, int last)
++{
++  int try = (first + last)/2;
++
++  if(!strstr(data[try]->name, name)){
++     if(first == try) /* first == last || first + 1 == last */
++	return strstr(data[last]->name, name) ? 1 : 0;
++     if(strcmp(data[try]->name, name) < 0) /*data[try] < name < data[end] */
++	return courier_search_list(data, name, try, last);
++     else	/* data[begin] < name < data[try] */
++	return courier_search_list(data, name, first, try);
++  }
++  return 1;
++}
++
++/* Lists all directories that are subdirectories of a given directory */
++
++COURIER_S *courier_list_dir(char *curdir)
++{
++  struct direct **names = NIL;
++  struct stat sbuf;
++  unsigned long ndir;
++  COURIER_S *cdir = NULL;
++  char tmp[MAILTMPLEN], tmp2[MAILTMPLEN], pathname[MAILTMPLEN], 
++	realname[MAILTMPLEN];
++  int i, j, scand, td;
++
++  /* There are two cases, either curdir is 
++ 	 #mc/INBOX.	 #mc/INBOX.foo
++	or
++	 #mc/Maildir/. 	 #mc/Maildir/.foo
++   */
++  strcpy(tmp,curdir + 4);
++  if(!strncmp(ucase(tmp), "INBOX", 5))
++    strcpy(tmp, "#mc/INBOX.");
++  else{
++   strcpy(tmp, curdir);
++   for (i = strlen(tmp) - 1; tmp[i] && tmp[i] != '/'; i--);
++   tmp[i+2] = '\0'; 	/* keep the last "." intact */
++  }
++  maildir_file_path(tmp, realname);
++  maildir_scandir (realname, &names, &ndir, &scand, COURIER);
++
++  if (scand > 0){
++     cdir = courier_get_cdir(ndir);
++     cdir->path = cpystr(realname);
++     for(i = 0, j = 0; i < ndir; i++){
++        td = realname[strlen(realname) - 1] == '.'
++		&& *names[i]->d_name == '.';
++	sprintf(tmp2,"%s%s", tmp, names[i]->d_name+1);
++	sprintf(pathname,"%s%s", realname, names[i]->d_name + td);
++	if(stat(pathname, &sbuf) == 0 && S_ISDIR(sbuf.st_mode)){
++	   cdir->data[j] = (COURIERLOCAL *) fs_get(sizeof(COURIERLOCAL));
++	   cdir->data[j++]->name = cpystr(tmp2);
++	}
++	fs_give((void **)&names[i]);
++     }
++     cdir->total = j;
++     if(cdir->total == 0)
++        courier_free_cdir(&cdir);
++  }
++  if(names)
++    fs_give((void **) &names);
++  return cdir;
++}
++
++void
++courier_list_info(COURIER_S **cdirp, char *data, int i)
++{
++   long style = (long) maildir_parameters(GET_COURIERSTYLE, NIL);
++   COURIER_S *cdir = *cdirp;
++
++   if(maildir_valid(cdir->data[i]->name)){
++      if(courier_search_list(cdir->data, data, 0, cdir->total - 1))
++	 cdir->data[i]->attribute = LATT_HASCHILDREN;
++      else
++	 cdir->data[i]->attribute = (style == COURIER)
++				? LATT_HASNOCHILDREN : LATT_NOINFERIORS;
++   }
++   else
++      cdir->data[i]->attribute = LATT_NOSELECT;
++      cdir->data[i]->attribute += maildir_any_new_msgs(cdir->data[i]->name) 
++					? LATT_MARKED : LATT_UNMARKED;
++}
+diff -ruN uw-imap-2007~dfsg.orig/src/osdep/unix/maildir.h uw-imap-2007~dfsg/src/osdep/unix/maildir.h
+--- uw-imap-2007~dfsg.orig/src/osdep/unix/maildir.h	1970-01-01 01:00:00.000000000 +0100
++++ uw-imap-2007~dfsg/src/osdep/unix/maildir.h	2007-12-26 20:12:59.000000000 +0100
+@@ -0,0 +1,199 @@
++/* 
++ * A few definitions that try to make this module portable to other
++ * platforms (e.g. Cygwin). This module is based on the information from
++ * http://cr.yp.to/proto/maildir.html
++ */
++
++/* First we deal with the separator character */
++#ifndef FLAGSEP
++#define FLAGSEP ':'
++#endif
++#define SIZESEP ','
++
++#define MDUIDVALIDITY	".uidvalidity"	/* support for old maildirs   */
++#define MDDIR		".mdir"		/* this folder is a directory */
++
++const char sep1[] = {FLAGSEP, '1', ',', '\0'}; /* experimental semantics*/
++const char sep2[] = {FLAGSEP, '2', ',', '\0'}; /* Flags Information	*/
++const char sep3[] = {FLAGSEP, '3', ',', '\0'}; /* Grrrr....		*/
++
++const char *sep[] = { sep1, sep2, sep3, NULL};
++
++#define MDSEP(i)  sep[((i) - 1)]
++
++/* Now we deal with flags. Woohoo! */
++typedef enum  {Draft, Flagged, Passed, Replied, Seen, Trashed, 
++	       EmptyFlag, EndFlags} MdFlagNamesType;
++const int mdimapflags[] = {Draft, Flagged, Replied, Seen, Trashed, EmptyFlag, EndFlags};
++const int mdkwdflags[]  = {Passed, EmptyFlag, EndFlags};
++
++/* this array lists the codes for mdflgnms (maildir flag names) above */
++const char *mdflags[] = { "D", "F", "P", "R", "S", "T", "", NULL};
++/* and as characters too */
++const char cmdflags[] = { 'D', 'F', 'P', 'R', 'S', 'T', '0', '\0'};
++
++/* MDFLAG(Seen, elt->seen) */
++#define MDFLAG(i,j) mdflags[j ? (i) : EmptyFlag]
++/* MDFLAGC(Seen) */
++#define MDFLAGC(i) cmdflags[(i)]
++
++/* Now we deal with the directory structure */
++typedef enum {Cur, Tmp, New, EndDir} DirNamesType;
++char *mdstruct[] = {"cur", "tmp", "new", NULL};
++#define MDNAME(i) mdstruct[(i)]
++#define MDFLD(tmp, dir, i) sprintf((tmp),"%s/%s", (dir), mdstruct[(i)])
++#define MSGPATH(tmp, dir, msg,i) sprintf((tmp),"%s/%s/%s", (dir), mdstruct[(i)],(msg))
++
++/* Support of Courier Structure */
++#define CCLIENT 0
++#define COURIER 1
++#define IS_CCLIENT(t) \
++		(((t) && (t)[0] == '#' && ((t)[1] == 'm' || (t)[1] == 'M')\
++		&& ((t)[2] == 'd' || (t)[2] == 'D')\
++		&& (t)[3] == '/'  && (t)[4] != '\0') ? 1 : 0)
++
++#define IS_COURIER(t) \
++		(((t) && (t)[0] == '#' && ((t)[1] == 'm' || (t)[1] == 'M')\
++		&& ((t)[2] == 'c' || (t)[2] == 'C')\
++		&& (t)[3] == '/'  && (t)[4] != '\0') ? 1 : 0)
++#define MDPREFIX(s) ((s) ? "#mc/" : "#md/")
++#define MDSEPARATOR(s) ((s) ? '.' : '/')
++
++
++/* Now we deal with messages filenames */
++char mdlocaldomain[MAILTMPLEN+1] = {'\0'};
++static char *mdfpath = NULL;
++static char *myMdInboxDir = NIL;/* Location of the Maildir INBOX */
++static long CourierStyle = CCLIENT;
++
++#define CHUNK	16384	/* from unix.h */
++
++typedef struct courier_local {
++  char *name;		/* name of directory/folder */
++  int attribute;	/* attributes (children/marked/etc) */
++} COURIERLOCAL;
++
++typedef struct courier {
++  char *path;			/* Path to collection */
++  time_t scantime;		/* time at which information was generated */
++  int total;			/* total number of elements in data */
++  COURIERLOCAL **data;
++} COURIER_S;
++
++/* In gdb this is the  *(struct maildir_local *)stream->local structure */
++typedef struct maildir_local {
++  unsigned int dirty : 1;	/* diskcopy needs updating */
++  unsigned int courier : 1;	/* It is Courier style file system */
++  unsigned int link : 1;	/* There is a symbolic link */
++  int fd;			/* fd of open message */
++  char *dir;			/* mail directory name */
++  char *curdir;			/* mail directory name/cur */
++  unsigned char *buf;		/* temporary buffer */
++  unsigned long buflen;		/* current size of temporary buffer */
++  time_t scantime;		/* last time directory scanned */
++} MAILDIRLOCAL;
++
++/* Convenient access to local data */
++#define LOCAL ((MAILDIRLOCAL *) stream->local)
++
++typedef struct maildir_file_info {
++   char *name;		/* name of the file			   */
++   DirNamesType loc;	/* location of this file		   */
++   unsigned long pos;	/* place in list where this file is listed */
++   off_t size;		/* size in bytes, on disk */
++   time_t atime;	/* last access time */
++   time_t mtime;	/* last modified time */
++   time_t ctime;	/* last changed time */
++} MAILDIRFILE;
++
++#define MDFILE(F) (((MAILDIRFILE *)((F)->private.spare.ptr))->name)
++#define MDLOC(F)  (((MAILDIRFILE *)((F)->private.spare.ptr))->loc)
++#define MDPOS(F)  (((MAILDIRFILE *)((F)->private.spare.ptr))->pos)
++#define MDSIZE(F)  (((MAILDIRFILE *)((F)->private.spare.ptr))->size)
++#define MDATIME(F)  (((MAILDIRFILE *)((F)->private.spare.ptr))->atime)
++#define MDMTIME(F)  (((MAILDIRFILE *)((F)->private.spare.ptr))->mtime)
++#define MDCTIME(F)  (((MAILDIRFILE *)((F)->private.spare.ptr))->ctime)
++
++/* Function prototypes */
++
++DRIVER *maildir_valid (char *name);
++MAILSTREAM *maildir_open (MAILSTREAM *stream);
++void maildir_close (MAILSTREAM *stream, long options);
++long maildir_ping (MAILSTREAM *stream);
++void maildir_check (MAILSTREAM *stream);
++long maildir_text (MAILSTREAM *stream,unsigned long msgno,STRING *bs,long flags);
++char *maildir_header (MAILSTREAM *stream,unsigned long msgno,
++		unsigned long *length, long flags);
++void maildir_list (MAILSTREAM *stream,char *ref,char *pat);
++void *maildir_parameters (long function,void *value);
++int maildir_create_folder (char *mailbox);
++long maildir_create (MAILSTREAM *stream,char *mailbox);
++void maildir_flagmsg (MAILSTREAM *stream,MESSAGECACHE *elt); /*check */
++long maildir_expunge (MAILSTREAM *stream, char *sequence, long options);
++long maildir_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options);
++long maildir_append (MAILSTREAM *stream,char *mailbox, append_t af, void *data);
++long maildir_delete (MAILSTREAM *stream,char *mailbox);
++long maildir_rename (MAILSTREAM *stream,char *old,char *new);
++long maildir_sub (MAILSTREAM *stream,char *mailbox);
++long maildir_unsub (MAILSTREAM *stream,char *mailbox);
++void maildir_lsub (MAILSTREAM *stream,char *ref,char *pat);
++void courier_list (MAILSTREAM *stream,char *ref, char *pat);
++
++/* utility functions */
++void courier_realname (char *name, char *realname);
++long maildir_dirfmttest (char *name);
++char *maildir_file (char *dst,char *name);
++int maildir_select (const struct direct *name);
++int maildir_namesort (const void *d1, const void *d2);
++unsigned long antoul (char *seed);
++unsigned long mdfntoul (char *name);
++int courier_dir_select (const struct direct *name);
++int courier_dir_sort (const void *d1, const void *d2);
++long maildir_canonicalize (char *pattern,char *ref,char *pat);
++void maildir_list_work (MAILSTREAM *stream,char *subdir,char *pat,long level);
++void courier_list_work (MAILSTREAM *stream,char *subdir,char *pat,long level);
++int maildir_file_path(char *name, char *tmp);
++int maildir_valid_name (char *name);
++int maildir_valid_dir (char *name);
++int is_valid_maildir (char **name);
++int maildir_message_exists(MAILSTREAM *stream,char *name, char *tmp);
++char *maildir_remove_root(char *name);
++char *maildir_text_work (MAILSTREAM *stream,MESSAGECACHE *elt, unsigned long *length,long flags);
++unsigned long  maildir_parse_message(MAILSTREAM *stream, unsigned long msgno, 
++						DirNamesType dirtype);
++int maildir_eliminate_duplicate (char *name, struct direct ***flist, 
++					unsigned long *nfiles);
++int maildir_doscandir (char *name, struct direct ***flist, int flag);
++unsigned long maildir_scandir (char *name, struct direct ***flist,
++			unsigned long *nfiles, int *scand, int flag);
++void maildir_parse_folder (MAILSTREAM *stream, int full);
++void  md_domain_name (void);
++char  *myrootdir (char *name);
++char  *mdirpath (void);
++int   maildir_initial_check (MAILSTREAM *stream, DirNamesType dirtype);
++unsigned long  maildir_parse_dir(MAILSTREAM *stream, unsigned long nmsgs, 
++   DirNamesType dirtype, struct direct **names, unsigned long nfiles, int full);
++int same_maildir_file(char *name1, char *name2);
++int comp_maildir_file(char *name1, char *name2);
++int maildir_message_in_list(char *msgname, struct direct **names,
++		unsigned long bottom, unsigned long top, unsigned long *pos);
++void maildir_getflag(char *name, int *d, int *f, int *r ,int *s, int *t);
++int maildir_update_elt_maildirp(MAILSTREAM *stream, unsigned long msgno);
++void maildir_abort (MAILSTREAM *stream);
++int maildir_contains_folder(char *dirname, char *name);
++int maildir_is_dir(char *dirname, char *name);
++int maildir_dir_is_empty(char *mailbox);
++int maildir_create_work (char *mailbox, int loop);
++void maildir_get_file (MAILDIRFILE **mdfile);
++void maildir_free_file (void **mdfile);
++void maildir_free_file_only (void **mdfile);
++int maildir_any_new_msgs(char *mailbox);
++void maildir_get_date(MAILSTREAM *stream, unsigned long msgno);
++void maildir_fast (MAILSTREAM *stream,char *sequence,long flags);
++
++/* Courier server support */
++void courier_free_cdir (COURIER_S **cdir);
++COURIER_S *courier_get_cdir (int total);
++int courier_search_list(COURIERLOCAL **data, char *name, int first, int last);
++COURIER_S *courier_list_dir(char *curdir);
++void courier_list_info(COURIER_S **cdirp, char *data, int i);
+diff -ruN uw-imap-2007~dfsg.orig/src/osdep/unix/Makefile uw-imap-2007~dfsg/src/osdep/unix/Makefile
+--- uw-imap-2007~dfsg.orig/src/osdep/unix/Makefile	2007-12-26 19:33:39.000000000 +0100
++++ uw-imap-2007~dfsg/src/osdep/unix/Makefile	2007-12-26 20:12:59.000000000 +0100
+@@ -144,7 +144,7 @@
+ # However, mh needs to be before any sysinbox formats (such as mmdf or unix)
+ # since otherwise INBOX won't work correctly when mh_allow_inbox is set.
+ #
+-DEFAULTDRIVERS=imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile
++DEFAULTDRIVERS=maildir courier imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile
+ CHUNKSIZE=65536
+ 
+ # Normally no need to change any of these
+@@ -153,7 +153,7 @@
+ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \
+  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
++ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o maildir.o
+ CFLAGS=-g
+ 
+ CAT=cat
+@@ -282,7 +282,7 @@
+ 
+ cyg:	# Cygwin - note that most local file drivers don't work!!
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+-	DEFAULTDRIVERS="imap nntp pop3 mbx unix phile" \
++	DEFAULTDRIVERS="imap nntp pop3 mbx unix maildir phile" \
+ 	SIGTYPE=psx CHECKPW=cyg LOGINPW=cyg CRXTYPE=std \
+ 	SPOOLDIR=/var \
+ 	ACTIVEFILE=/usr/local/news/lib/active \
+@@ -904,7 +904,7 @@
+ unix.o: mail.h misc.h osdep.h unix.h pseudo.h dummy.h
+ utf8.o: mail.h misc.h osdep.h utf8.h tmap.c widths.c
+ utf8aux.o: mail.h misc.h osdep.h utf8.h
+-
++maildir.o: mail.h misc.h osdep.h maildir.h dummy.h
+ 
+ # OS-dependent
+ 
+diff -ruN uw-imap-2007~dfsg.orig/src/osdep/unix/os_cyg.h uw-imap-2007~dfsg/src/osdep/unix/os_cyg.h
+--- uw-imap-2007~dfsg.orig/src/osdep/unix/os_cyg.h	2007-12-26 19:33:39.000000000 +0100
++++ uw-imap-2007~dfsg/src/osdep/unix/os_cyg.h	2007-12-26 20:12:59.000000000 +0100
+@@ -47,6 +47,7 @@
+ #define setpgrp setpgid
+ 
+ #define SYSTEMUID 18		/* Cygwin returns this for SYSTEM */
++#define FLAGSEP ';'
+ #define geteuid Geteuid
+ uid_t Geteuid (void);
+ 
--- uw-imap-2007b~dfsg.orig/debian/patches/series
+++ uw-imap-2007b~dfsg/debian/patches/series
@@ -0,0 +1,8 @@
+0001_insecure_strcmp.patch
+0002_no_close_quit_netstream.patch
+0003_CVE-2008-5514.patch
+1001_shlibs.patch
+1003_maildir.patch
+2002_mailspool.patch
+2004_no_binaries_below_etc.patch
+2010_disallow_escaping_home.patch
--- uw-imap-2007b~dfsg.orig/debian/patches/0003_CVE-2008-5514.patch
+++ uw-imap-2007b~dfsg/debian/patches/0003_CVE-2008-5514.patch
@@ -0,0 +1,20 @@
+--- a/src/c-client/rfc822.c	2008-05-15 00:34:51.000000000 +0200
++++ b/src/c-client/rfc822.c	2008-12-17 00:52:15.000000000 +0100
+@@ -1351,6 +1351,7 @@
+ 
+ static long rfc822_output_char (RFC822BUFFER *buf,int c)
+ {
++  if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL;
+   *buf->cur++ = c;		/* add character, soutr buffer if full */
+   return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT;
+ }
+@@ -1374,7 +1375,8 @@
+       len -= i;
+     }
+ 				/* soutr buffer now if full */
+-    if (len && !rfc822_output_flush (buf)) return NIL;
++    if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf))
++      return NIL;
+   }
+   return LONGT;
+ }
--- uw-imap-2007b~dfsg.orig/debian/ipopd.install
+++ uw-imap-2007b~dfsg/debian/ipopd.install
@@ -0,0 +1,2 @@
+ipopd/ipop2d		/usr/sbin/
+ipopd/ipop3d		/usr/sbin/
--- uw-imap-2007b~dfsg.orig/debian/ipopd.logcheck.ignore.server
+++ uw-imap-2007b~dfsg/debian/ipopd.logcheck.ignore.server
@@ -0,0 +1,9 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[23]d\[[0-9]+\]: (Broken pipe|Command stream end of file|Connection (reset by peer|timed out)|No route to host|Transport endpoint is not connected)(,)? while (reading (authentication|line|literal|char)|writing text) (user=[^[:space:]]+ )?host=(([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[23]d\[[0-9]+\]: (connect|(pop3(s SSL)?) service init) from [^[:space:]]+( \([\.0-9]+\))?$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[23]d\[[0-9]+\]: Killed \(lost mailbox lock\) user=[^[:space:]]+ host=(([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[23]d\[[0-9]+\]: (Login|APOP|Auth|(A|Prea)uthenticated|Logout|Autologout) user=[^[:space:]]+ host=(([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)( nmsgs=[/0-9]+( ndele=[0-9]+)?)?$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[23]d\[[0-9]+\]: Moved [0-9]+ bytes of new mail to [^[:space:]]+ from [^[:space:]]+ host= (([^[:space:]]+ )?\[[\.0-9]+\]|NON-IPv4|UNKNOWN)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[32]d\[[0-9]+\]: Error opening or locking INBOX user=[^[:space:]]+ host=[^[:space:]]+( \[[\.0-9]+\])?$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[32]d\[[0-9]+\]: Expunge ignored on readonly mailbox
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[32]d\[[0-9]+\]: Mailbox is open by another process, access is readonly
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ipop[32]d\[[0-9]+\]: Trying to get mailbox lock from process [0-9]+
--- uw-imap-2007b~dfsg.orig/debian/copyright
+++ uw-imap-2007b~dfsg/debian/copyright
@@ -0,0 +1,32 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=163
+Upstream-Name: IMAP Toolkit Environment
+Upstream-Maintainer: c-client-request@u.washington.edu
+                     http://www.washington.edu/imap/imap-list.html
+                     news:comp.mail.imap
+Upstream-Source-Location: ftp://ftp.cac.washington.edu/mail/
+                          http://staff.washington.edu/chappa/pine/info/maildir.html
+
+Files: *
+Copyright: © 1988-2008, University of Washington
+License: Apache-2.0
+
+Files: src/c-client/rfc822.[ch], src/c-client/misc.[ch],
+ src/c-client/smtp.[ch], src/c-client/imap4r1.c, src/mtest/mtest.c
+Copyright: © 1988-2008, University of Washington
+License: Apache-2.0 | other
+ This original version of this file is
+ Copyright 1988 Stanford University
+ and was developed in the Symbolic Systems Resources Group of the Knowledge
+ Systems Laboratory at Stanford University in 1987-88, and was funded by the
+ Biomedical Research Technology Program of the NationalInstitutes of Health
+ under grant number RR-00785.
+
+Files: debian/*
+Copyright: © 2002-2008, Jonas Smedegaard <dr@jones.dk>
+           © 2000-2002, Jaldhar H. Vyas <jaldhar@debian.org>
+License: GPL-2+
+
+On Debian systems, the complete text of the GNU GPL (General Public
+License) version 2 can be found at /usr/share/common-licenses/GPL-2, and
+the complete text of the Apache license version 2.0 can be found at
+/usr/share/common-licenses/Apache-2.0.
--- uw-imap-2007b~dfsg.orig/debian/control.in.in
+++ uw-imap-2007b~dfsg/debian/control.in.in
@@ -0,0 +1,119 @@
+Source: uw-imap
+Priority: optional
+Section: mail
+Maintainer: Jonas Smedegaard <dr@jones.dk>
+Standards-Version: 3.7.3
+Build-Depends: @cdbs@
+Vcs-Git: git://git.debian.org/git/collab-maint/uw-imap.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/uw-imap.git;a=summary
+Homepage: http://www.washington.edu/imap/
+
+Package: uw-imapd
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openssl, libpam-runtime (>= 0.76-13.1), openbsd-inetd | inet-superserver
+Recommends: exim4 | mail-transport-agent
+Suggests: mutt | imap-client, logcheck
+Provides: imap-server
+Conflicts: imap-server
+Description: remote mail folder access server using IMAP4rev1
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains imapd, an IMAP4rev1 server daemon which uses the
+ c-client library.
+
+Package: ipopd
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openssl, libpam-runtime (>= 0.76-13.1), openbsd-inetd | inet-superserver
+Recommends: exim4 | mail-transport-agent
+Conflicts: pop3-server
+Provides: pop3-server
+Suggests: logcheck
+Description: POP2 and POP3 mail server
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains ipopd, a POP2 and POP3 server daemon which uses
+ the c-client library.
+
+Package: libc-client__VER__-dev
+Section: libdevel
+Architecture: any
+Depends: libc-client__VER__ (= ${binary:Version}), ${devlibs:Depends}
+Conflicts: libc-client-dev
+Replaces: libc-client-dev
+Provides: libc-client-dev
+Description: c-client library for mail protocols - development files
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains the static c-client library and development
+ headers.
+
+Package: libc-client__VER__
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-modules, mlock
+Suggests: uw-mailutils
+Description: c-client library for mail protocols - library files
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains the shared c-client library.
+
+Package: mlock
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: mailbox locking program
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains a program to lock mailbox files to avoid
+ corruption.
+
+Package: uw-mailutils
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: c-client support programs
+ IMAP (Internet Message Access Protocol) is a method of accessing
+ electronic messages kept on a (possibly shared) mail server.
+ .
+ The UW (University of Washington) IMAP toolkit provides the c-client
+ mail-handling library supporting various network transport methods,
+ file system storage formats, and authentication and authorization
+ methods.
+ .
+ This package contains helper tools for the libc-client library:
+  - mailutil: utility program which helps manage email mailboxes (both
+              local and IMAP/POP3/NNTP);
+  - dmail:    MDA (Mail Delivery Agent) for use with procmail;
+  - tmail:    MDA for use with the system mailer (such as Sendmail or Postfix).
--- uw-imap-2007b~dfsg.orig/debian/__PKG__.pam._in
+++ uw-imap-2007b~dfsg/debian/__PKG__.pam._in
@@ -0,0 +1,10 @@
+#
+# The PAM configuration file for the UW IMAPd `__PAMSERVICE__' service
+#
+
+# The standard Unix authentication modules, used with
+# NIS (man nsswitch) as well as normal /etc/passwd and
+# /etc/shadow entries.
+@include common-auth
+@include common-account
+@include common-session
--- uw-imap-2007b~dfsg.orig/debian/ipopd.manpages
+++ uw-imap-2007b~dfsg/debian/ipopd.manpages
@@ -0,0 +1 @@
+src/ipopd/ipopd.8
--- uw-imap-2007b~dfsg.orig/debian/uw-imapd.install
+++ uw-imap-2007b~dfsg/debian/uw-imapd.install
@@ -0,0 +1 @@
+imapd/imapd			/usr/sbin/
--- uw-imap-2007b~dfsg.orig/debian/mlock.lintian-overrides
+++ uw-imap-2007b~dfsg/debian/mlock.lintian-overrides
@@ -0,0 +1 @@
+mlock: setgid-binary usr/bin/mlock 2755 root/mail
--- uw-imap-2007b~dfsg.orig/debian/libc-client__VER__.docs.in
+++ uw-imap-2007b~dfsg/debian/libc-client__VER__.docs.in
@@ -0,0 +1,14 @@
+docs/FAQ.txt
+docs/FAQ.html
+docs/Y2K
+docs/RELNOTES
+docs/bugs.txt
+docs/calendar.txt
+docs/drivers.txt
+docs/formats.txt
+docs/imaprc.txt
+docs/internal.txt
+docs/locking.txt
+docs/md5.txt
+docs/naming.txt
+README.maildir
