[SVN] r478 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch patches/00list

[debian at incase.de]

Author: sven
Date: Thu Jun  8 12:37:47 2006
New Revision: 478

URL: https://mail.incase.de/viewcvs?rev=478&root=cyrus22&view=rev
Log:
Add an upstream fix to imapoptions (fixes a typo: prepend vs. append)

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.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=478&root=cyrus22&r1=477&r2=478&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Thu Jun  8 12:37:47 2006
@@ -20,6 +20,7 @@
   * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther
     <guenther at sendmail.com>)
   * Add upstream patch to allow reporting of mailbox sizes above 4GB
+  * Add upstream patch to fix a documentation error in imapoptions
 
   [ Benjamin Seidenberg ]
   * Fix typos in UPGRADE.Debian (Closes: #368675)

Added: trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch?rev=478&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch Thu Jun  8 12:37:47 2006
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileDNZ3cU.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-06-04 21:47:19.000000000 +0200
++++ /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions	2006-06-06 17:51:14.392340472 +0200
+@@ -42,7 +42,7 @@
+ .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+-.\" $Id: imapoptions,v 1.36 2006/03/30 15:49:58 murch Exp $
++.\" $Id: imapoptions,v 1.37 2006/06/05 23:31:22 murch Exp $
+ .SH NAME
+ imapd.conf \- IMAP configuration file
+ .SH DESCRIPTION
+@@ -801,7 +801,7 @@
+ /* The cyrusdb backend to use for the subscriptions list. */
+ 
+ { "syslog_prefix", NULL, STRING }
+-/* String to be appended to the process name in syslog entries. */
++/* String to be prepended to the process name in syslog entries. */
+ 
+ { "temp_path", "/tmp", STRING }
+ /* The pathname to store temporary files in */

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.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=478&root=cyrus22&r1=477&r2=478&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Thu Jun  8 12:37:47 2006
@@ -12,6 +12,7 @@
 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
 0013-upstream-allow-report-above-4GB-mboxsize.dpatch
 0014-upstream-fix-locks-during-reconstruction.dpatch
+0015-upstream-fix-logic-error-in-imapoptions.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch