[SVN] r618 - in /branches: cyrus23/cyrus-imapd-2.3-2.3.7/debian/
cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/
cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/ sarge-2.2.13/debian/
sarge-2.2.13/debian/patches/ sarge-2.2.13/debian/po/
debian at incase.de
debian at incase.de
Sat Sep 16 17:51:27 UTC 2006
Author: astronut
Date: Sat Sep 16 19:51:26 2006
New Revision: 618
URL: https://mail.incase.de/viewcvs?rev=618&root=cyrus22&view=rev
Log:
Merge changes to 2.3 and sarge branches
Added:
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/ru.po
- copied unchanged from r616, trunk/cyrus-imapd-2.2.13/debian/po/ru.po
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/vi.po
- copied unchanged from r616, trunk/cyrus-imapd-2.2.13/debian/po/vi.po
branches/sarge-2.2.13/debian/po/ru.po
- copied unchanged from r617, trunk/cyrus-imapd-2.2.13/debian/po/ru.po
branches/sarge-2.2.13/debian/po/vi.po
- copied unchanged from r617, trunk/cyrus-imapd-2.2.13/debian/po/vi.po
Modified:
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/75-update-imapd.conf-documentation.dpatch
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po
branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po
branches/sarge-2.2.13/debian/changelog
branches/sarge-2.2.13/debian/logcheck.ignore
branches/sarge-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
branches/sarge-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch
branches/sarge-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
branches/sarge-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
branches/sarge-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
branches/sarge-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
branches/sarge-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
branches/sarge-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
branches/sarge-2.2.13/debian/po/nl.po
branches/sarge-2.2.13/debian/po/pt_BR.po
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog Sat Sep 16 19:51:26 2006
@@ -24,9 +24,22 @@
* Merge svn work from -6 to HEAD (base of Farzad's package) into 2.3 branch
* Fix debian/po/POTFILES.in to refer to cyrus-common-2.3.templates instead
of 2.2.
- *
+
-- Benjamin Seidenberg <astronut at dlgeek.net> Tue, 5 Sep 2006 23:20:52 -0400
+
+cyrus-imapd-2.2 (2.2.13-8) UNRELEASED; urgency=low
+
+ [ Sven Mueller ]
+ * New vietnamese translation (thanks to Clytie Siddall, Closes: #383281)
+ * New russian translation (thanks to Yuri Kozlov, Closes: #383217)
+ * Updated dutch translation (thanks to Kurt De Bree, Closes: #384870)
+ * Updated logcheck rules a bit more, thanks to Ross Boylan (Closes: #384265)
+
+ [ Henrique de Moraes Holschuh ]
+ * Update pt_BR debconf translation
+
+ -- Sven Mueller <sven at debian.org> Sat, 16 Sep 2006 19:28:54 +0200
cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore Sat Sep 16 19:51:26 2006
@@ -58,6 +58,7 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: Expunged [0-9]+ messages from
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <[^>]+> +to mailbox: .*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <?[^ >]+>? +to mailbox: .*$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: sieve redirected: <?[^ >]+>? +to: [._[:alnum:]-]+@[._[:alnum:]-]+$
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/0019-upstream-sieve_allowreferrals.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/0019-upstream-sieve_allowreferrals.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/0019-upstream-sieve_allowreferrals.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## file2kvUnB.dpatch by Sven Mueller <sven at debian.org>
+## 0019-upstream-sieve_allowreferrals.dpatch by Sven Mueller <sven at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Upstream: patch sieve to allow referrals
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/75-update-imapd.conf-documentation.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/75-update-imapd.conf-documentation.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/75-update-imapd.conf-documentation.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/75-update-imapd.conf-documentation.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileV0WscV.dpatch by Sven Mueller <sven at debian.org>
+## 75-update-imapd.conf-documentation.dpatch by Sven Mueller <sven at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: update imapd.conf option descriptions to be a bit more verbose about
+## DP: supported option names
@DPATCH@
diff -urNad cyrus-imapd-2.3.7~/lib/imapoptions cyrus-imapd-2.3.7/lib/imapoptions
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po Sat Sep 16 19:51:26 2006
@@ -1,3 +1,5 @@
+# Translation of cyrus-imapd-2.2.13_templates.po to Debian l10n Dutch
+# This file is distributed under the same license as the cyrus-imapd package.
#
# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
@@ -11,13 +13,16 @@
#
# Developers do not need to manually edit POT or PO files.
#
+# Luk Claes <luk.claes at ugent.be>, 2004
+# Kurt De Bree <kdebree at telenet.be>, 2006
+#
msgid ""
msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
+"Project-Id-Version: cyrus-imapd-2.2.13\n"
"Report-Msgid-Bugs-To: pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-09-05 23:14-0400\n"
-"PO-Revision-Date: 2004-03-29 10:57+0100\n"
-"Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
+"PO-Revision-Date: 2006-08-19 19:57+0200\n"
+"Last-Translator: Kurt De Bree <kdebree at telenet.be>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@@ -27,7 +32,7 @@
#. Description
#: ../cyrus-common-2.3.templates:1001
msgid "Database backends have changed!"
-msgstr "Databank-backends zijn gewijzigd!"
+msgstr "Database-backends zijn gewijzigd!"
#. Type: note
#. Description
@@ -39,8 +44,8 @@
"changed."
msgstr ""
"Vergelijking tussen /usr/lib/cyrus/cyrus-db-types.txt en /usr/lib/cyrus/"
-"cyrus-db-types.active leert ons dat de databank-backends voor Cyrus IMAPd "
-"gewijzigd zijn."
+"cyrus-db-types.active leert ons dat de database-backends voor Cyrus-IMAPd "
+"zijn gewijzigd."
#. Type: note
#. Description
@@ -50,9 +55,9 @@
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Dit betekent dat deze databanken, waarvan de databank-backends gewijzigd "
-"zijn, mogelijk handmatig geconverteerd moeten worden naar het nieuwe "
-"formaat, gebruik makend van het cvt_cyrusdb(8)-hulpmiddel."
+"Dit betekent dat deze databases, waarvan de database-backends zijn "
+"gewijzigd, mogelijk handmatig moeten worden geconverteerd naar het nieuwe "
+"formaat, gebruikmakend van het cvt_cyrusdb(8)-hulpmiddel."
#. Type: note
#. Description
@@ -64,25 +69,24 @@
"databases to the new format."
msgstr ""
"Raadpleeg /usr/share/doc/cyrus-common-2.2/README.Debian.database voor meer "
-"informatie. Start cyrmaster niet vooraleer u de databanken naar het nieuwe "
+"informatie. Start cyrmaster niet vooraleer u de databases naar het nieuwe "
"formaat geconverteerd hebt."
#. Type: boolean
#. Description
#: ../cyrus-common-2.3.templates:2001
msgid "Remove the mail and news spools?"
-msgstr "De Cyrus-spools, en gebruikers-sieve-scripts verwijderen?"
+msgstr "Mail- en nieuws-spools verwijderen?"
#. Type: boolean
#. Description
#: ../cyrus-common-2.3.templates:2001
-#, fuzzy
msgid ""
"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
"removed when the package is purged."
msgstr ""
-"Moeten de Cyrus-mail- en -nieuws-spools verwijderd worden, alsook de "
-"gebruikers-sieve-scripts, wanneer het pakket wordt gewist (purged)?"
+"De Cyrus mail- en nieuws-spools alsook de gebruikers-sieve-scripts kunnen "
+"worden verwijderd wanneer het pakket wordt gewist (purged)."
#. Type: boolean
#. Description
@@ -94,4 +98,4 @@
msgstr ""
"Deze vraag heeft enkel betrekking op de standaard spools en de sieve-"
"scriptmappen in /var. Als u deze locatie heeft gewijzigd in imapd.conf, dan "
-"zal de nieuwe locatie niet verwijderd worden; enkel de oude in /var."
+"zal de nieuwe locatie niet worden verwijderd; enkel de oude in /var."
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po Sat Sep 16 19:51:26 2006
@@ -68,14 +68,13 @@
#. Type: boolean
#. Description
#: ../cyrus-common-2.3.templates:2001
-#, fuzzy
msgid ""
"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
"removed when the package is purged."
msgstr ""
-"Devo remover as áreas de armazenagem (spools) usadas pelo Cyrus, assim como "
-"as áreas usadas para armazenar os scripts sieve dos usuários quando o pacote "
-"for eliminado (purge) do sistema ?"
+"É possível remover as áreas de armazenagem (spools) usadas pelo Cyrus, "
+"e também as áreas usadas para armazenar os scripts sieve dos usuários "
+"quando o pacote for eliminado (purge) do sistema."
#. Type: boolean
#. Description
Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Sat Sep 16 19:51:26 2006
@@ -1,8 +1,22 @@
-cyrus-imapd-2.2 (2.2.13-7~bpo1) sarge-backports; urgency=low
+<<<<<<< .working
+cyrus-imapd-2.2 (2.2.13-8~bpo1) sarge-backports; urgency=low
* backport to sarge
-- Sven Mueller <sven at debian.org> Wed, 13 Sep 2006 14:35:54 +0200
+
+cyrus-imapd-2.2 (2.2.13-8) UNRELEASED; urgency=low
+
+ [ Sven Mueller ]
+ * New vietnamese translation (thanks to Clytie Siddall, Closes: #383281)
+ * New russian translation (thanks to Yuri Kozlov, Closes: #383217)
+ * Updated dutch translation (thanks to Kurt De Bree, Closes: #384870)
+ * Updated logcheck rules a bit more, thanks to Ross Boylan (Closes: #384265)
+
+ [ Henrique de Moraes Holschuh ]
+ * Update pt_BR debconf translation
+
+ -- Sven Mueller <sven at debian.org> Sat, 16 Sep 2006 19:28:54 +0200
cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
Modified: branches/sarge-2.2.13/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/logcheck.ignore?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/logcheck.ignore (original)
+++ branches/sarge-2.2.13/debian/logcheck.ignore Sat Sep 16 19:51:26 2006
@@ -58,6 +58,7 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: Expunged [0-9]+ messages from
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <[^>]+> +to mailbox: .*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <?[^ >]+>? +to mailbox: .*$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: sieve redirected: <?[^ >]+>? +to: [._[:alnum:]-]+@[._[:alnum:]-]+$
Modified: branches/sarge-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileHfCUIw.dpatch by Sven Mueller <debian at incase.de>
+## 0002-allow_invalid_id_acl_removal.dpatch by Sven Mueller <debian at incase.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Upstream: Allow removal of invalid ID ACLs
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c
Modified: branches/sarge-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,10 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## filetu535I.dpatch by Sven Mueller <debian at incase.de>
+## 0003-upstream_disallow_userprobes.dpatch by Sven Mueller <debian at incase.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Upstream: Disallow probing for known user names
+## DP: Changes behaviour to always return "Login failed" instead of returning
+## DP: "Unknown user" for unknown user names.
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c
Modified: branches/sarge-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileQDLDMd.dpatch by Sven Mueller <debian at incase.de>
+## 0004-upstream-fetchnews-timezone-dst-fix.dpatch by Sven Mueller <debian at incase.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Upstream: Fix fetchnews timezone handling with regards to DST
+## DP: (daylight saving time)
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/imap/fetchnews.c /tmp/dpep.KgQkoe/cyrus-imapd-2.2.13/imap/fetchnews.c
Modified: branches/sarge-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileVnqQpc.dpatch by Sven Mueller <debian at incase.de>
+## 0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch by Sven Mueller <debian at incase.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fix a problem in ctl_mboxlist with remote mailboxes (it now also dumps
+## DP: and undumps mailbox type flags)
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html
Modified: branches/sarge-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileDNZ3cU.dpatch by Sven Mueller <debian at incase.de>
+## 0015-upstream-fix-logic-error-in-imapoptions.dpatch by Sven Mueller <debian at incase.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: fix a small logical mistake in imapoptions description
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions
Modified: branches/sarge-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch Sat Sep 16 19:51:26 2006
@@ -2,8 +2,7 @@
## upstream-fix-typos by Sven Mueller <sven at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: See https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/man/reconstruct.8.diff?r1=1.19&r2=1.20
-## DP: And https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/man/chk_cyrus.8.diff?r1=1.3&r2=1.4
+## DP: Upstream fix for some typos in manpages for reconstruct and chk_cyrus
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8
Modified: branches/sarge-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## file2kvUnB.dpatch by Sven Mueller <sven at debian.org>
+## 0019-upstream-sieve_allowreferrals.dpatch by Sven Mueller <sven at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Upstream: patch sieve to allow referrals
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html
Modified: branches/sarge-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch Sat Sep 16 19:51:26 2006
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileV0WscV.dpatch by Sven Mueller <sven at debian.org>
+## 75-update-imapd.conf-documentation.dpatch by Sven Mueller <sven at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: update imapd.conf option descriptions to be a bit more verbose about
+## DP: supported option names
@DPATCH@
diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions
Modified: branches/sarge-2.2.13/debian/po/nl.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/nl.po?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/nl.po (original)
+++ branches/sarge-2.2.13/debian/po/nl.po Sat Sep 16 19:51:26 2006
@@ -1,3 +1,5 @@
+# Translation of cyrus-imapd-2.2.13_templates.po to Debian l10n Dutch
+# This file is distributed under the same license as the cyrus-imapd package.
#
# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
@@ -11,13 +13,16 @@
#
# Developers do not need to manually edit POT or PO files.
#
+# Luk Claes <luk.claes at ugent.be>, 2004
+# Kurt De Bree <kdebree at telenet.be>, 2006
+#
msgid ""
msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
+"Project-Id-Version: cyrus-imapd-2.2.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2004-03-29 10:57+0100\n"
-"Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
+"PO-Revision-Date: 2006-08-19 19:57+0200\n"
+"Last-Translator: Kurt De Bree <kdebree at telenet.be>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@@ -27,7 +32,7 @@
#. Description
#: ../cyrus-common-2.2.templates:3
msgid "Database backends have changed!"
-msgstr "Databank-backends zijn gewijzigd!"
+msgstr "Database-backends zijn gewijzigd!"
#. Type: note
#. Description
@@ -38,8 +43,8 @@
"changed."
msgstr ""
"Vergelijking tussen /usr/lib/cyrus/cyrus-db-types.txt en /usr/lib/cyrus/"
-"cyrus-db-types.active leert ons dat de databank-backends voor Cyrus IMAPd "
-"gewijzigd zijn."
+"cyrus-db-types.active leert ons dat de database-backends voor Cyrus-IMAPd "
+"zijn gewijzigd."
#. Type: note
#. Description
@@ -49,9 +54,9 @@
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Dit betekent dat deze databanken, waarvan de databank-backends gewijzigd "
-"zijn, mogelijk handmatig geconverteerd moeten worden naar het nieuwe "
-"formaat, gebruik makend van het cvt_cyrusdb(8)-hulpmiddel."
+"Dit betekent dat deze databases, waarvan de database-backends zijn "
+"gewijzigd, mogelijk handmatig moeten worden geconverteerd naar het nieuwe "
+"formaat, gebruikmakend van het cvt_cyrusdb(8)-hulpmiddel."
#. Type: note
#. Description
@@ -62,25 +67,24 @@
"databases to the new format."
msgstr ""
"Raadpleeg /usr/share/doc/cyrus-common-2.2/README.Debian.database voor meer "
-"informatie. Start cyrmaster niet vooraleer u de databanken naar het nieuwe "
+"informatie. Start cyrmaster niet vooraleer u de databases naar het nieuwe "
"formaat geconverteerd hebt."
#. Type: boolean
#. Description
#: ../cyrus-common-2.2.templates:19
msgid "Remove the mail and news spools?"
-msgstr "De Cyrus-spools, en gebruikers-sieve-scripts verwijderen?"
+msgstr "Mail- en nieuws-spools verwijderen?"
#. Type: boolean
#. Description
#: ../cyrus-common-2.2.templates:19
-#, fuzzy
msgid ""
"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
"removed when the package is purged."
msgstr ""
-"Moeten de Cyrus-mail- en -nieuws-spools verwijderd worden, alsook de "
-"gebruikers-sieve-scripts, wanneer het pakket wordt gewist (purged)?"
+"De Cyrus mail- en nieuws-spools alsook de gebruikers-sieve-scripts kunnen "
+"worden verwijderd wanneer het pakket wordt gewist (purged)."
#. Type: boolean
#. Description
@@ -92,4 +96,4 @@
msgstr ""
"Deze vraag heeft enkel betrekking op de standaard spools en de sieve-"
"scriptmappen in /var. Als u deze locatie heeft gewijzigd in imapd.conf, dan "
-"zal de nieuwe locatie niet verwijderd worden; enkel de oude in /var."
+"zal de nieuwe locatie niet worden verwijderd; enkel de oude in /var."
Modified: branches/sarge-2.2.13/debian/po/pt_BR.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/pt_BR.po?rev=618&root=cyrus22&r1=617&r2=618&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/pt_BR.po (original)
+++ branches/sarge-2.2.13/debian/po/pt_BR.po Sat Sep 16 19:51:26 2006
@@ -66,14 +66,13 @@
#. Type: boolean
#. Description
#: ../cyrus-common-2.2.templates:19
-#, fuzzy
msgid ""
"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
"removed when the package is purged."
msgstr ""
-"Devo remover as áreas de armazenagem (spools) usadas pelo Cyrus, assim como "
-"as áreas usadas para armazenar os scripts sieve dos usuários quando o pacote "
-"for eliminado (purge) do sistema ?"
+"É possível remover as áreas de armazenagem (spools) usadas pelo Cyrus, "
+"e também as áreas usadas para armazenar os scripts sieve dos usuários "
+"quando o pacote for eliminado (purge) do sistema."
#. Type: boolean
#. Description
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list