[SVN] r489 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/0016-upstream-fix-typos.dpatch patches/00list

[debian at incase.de]

Author: sven
Date: Mon Jun 19 16:22:24 2006
New Revision: 489

URL: https://mail.incase.de/viewcvs?rev=489&root=cyrus22&view=rev
Log:
Add upstream typo fixes of the day (manpages)

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=489&root=cyrus22&r1=488&r2=489&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Mon Jun 19 16:22:24 2006
@@ -25,13 +25,15 @@
     integer of different size
   * Change the init script to actuall print some information when called with
     the "status" argument
+  * Add upstream typo fixes of the day. See 0016-upstream-fix-typos for
+    reference to upstream CVS
 
   [ Benjamin Seidenberg ]
   * Fix typos in UPGRADE.Debian (Closes: #368675)
   * Fix link in doc/html/readme.html (Closes: #368676)
   * Add upstream patch to fix POP locking when reconstructing
 
- -- Sven Mueller <debian at incase.de>  Sun, 18 Jun 2006 22:59:31 +0200
+ -- Sven Mueller <sven at debian.org>  Mon, 19 Jun 2006 16:16:26 +0200
 
 cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high
 

Added: trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch?rev=489&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch Mon Jun 19 16:22:24 2006
@@ -1,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/chk_cyrus.8
+--- cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-06-04 21:47:19.000000000 +0200
++++ /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-06-19 16:11:13.870518758 +0200
+@@ -40,7 +40,7 @@
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+ .SH NAME
+-chk_cyrus \- perform a consistancy check of the cyrus mailstore
++chk_cyrus \- perform a consistency check of the cyrus mailstore
+ .SH SYNOPSIS
+ .B chk_cyrus
+ [
+@@ -57,7 +57,7 @@
+ ]
+ .SH DESCRIPTION
+ .I Chk_cyrus
+-is used to perform a consistancy check on the cyrus datastore, and output
++is used to perform a consistency check on the cyrus datastore, and output
+ a list of files/directories that are expected to exist, but do not.
+ Status messagess are output to stderr, the list of files/directories is
+ output to stdout.  This list can be passed to a backup program to aid a
+@@ -73,10 +73,10 @@
+ Read configuration options from \fIconfig-file\fR.
+ .TP
+ .BI \-P " partition"
+-Run the consistancy check for only the given partition.
++Run the consistency check for only the given partition.
+ May not be specified with -M.
+ .BI \-M " mailbox"
+-Run the consistancy check for only the given mailbox.
++Run the consistency check for only the given mailbox.
+ May not be specified with -P.
+ .SH FILES
+ .TP
+diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/reconstruct.8
+--- cyrus-imapd-2.2.13/man/reconstruct.8	2006-06-04 21:47:19.000000000 +0200
++++ /tmp/dpep.52qXsO/cyrus-imapd-2.2.13/man/reconstruct.8	2006-06-19 16:10:34.583199793 +0200
+@@ -119,7 +119,7 @@
+ When processing a mailbox which is not in the mailbox list (e.g. via
+ the -p or -f options), do not import the metadata from the mailbox,
+ instead create it anew (this specifically affects atleast the mailbox's seen
+-stat unique identifier, user flags, and ACL).
++state unique identifier, user flags, and ACL).
+ .TP
+ .B \-r
+ Recursively reconstruct all sub-mailboxes of the mailboxes or mailbox

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=489&root=cyrus22&r1=488&r2=489&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Mon Jun 19 16:22:24 2006
@@ -13,6 +13,7 @@
 0013-upstream-allow-report-above-4GB-mboxsize.dpatch
 0014-upstream-fix-locks-during-reconstruction.dpatch
 0015-upstream-fix-logic-error-in-imapoptions.dpatch
+0016-upstream-fix-typos.dpatch
 0090-fix-casts.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch