[SVN] r497 - /branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch

[debian at incase.de]

Author: sven
Date: Wed Jun 28 23:40:47 2006
New Revision: 497

URL: https://mail.incase.de/viewcvs?rev=497&root=cyrus22&view=rev
Log:
Fix up patch (just an Id string)

Modified:
    branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch

Modified: branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch?rev=497&root=cyrus22&r1=496&r2=497&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch Wed Jun 28 23:40:47 2006
@@ -5,12 +5,12 @@
 ## DP: Upstream: don't lock/unlock_pop when reconstructing
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c
---- cyrus-imapd-2.2.13/imap/mailbox.c	2006-06-08 12:59:59.000000000 +0200
-+++ /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c	2006-06-08 13:00:01.083767966 +0200
+diff -urNad sarge-2.2.13/imap/mailbox.c /tmp/dpep.qRJmXg/sarge-2.2.13/imap/mailbox.c
+--- sarge-2.2.13/imap/mailbox.c	2006-06-28 23:39:08.000000000 +0200
++++ /tmp/dpep.qRJmXg/sarge-2.2.13/imap/mailbox.c	2006-06-28 23:39:45.502453129 +0200
 @@ -1,5 +1,5 @@
  /* mailbox.c -- Mailbox manipulation routines
-- * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
+- * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $
 + * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
   * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
   *
@@ -53,3 +53,20 @@
      mailbox_unlock_index(mailbox);
      mailbox_unlock_header(mailbox);
  
+diff -urNad sarge-2.2.13/imap/mailbox.c.rej /tmp/dpep.qRJmXg/sarge-2.2.13/imap/mailbox.c.rej
+--- sarge-2.2.13/imap/mailbox.c.rej	2006-06-28 23:39:08.000000000 +0200
++++ /tmp/dpep.qRJmXg/sarge-2.2.13/imap/mailbox.c.rej	1970-01-01 01:00:00.000000000 +0100
+@@ -1,13 +0,0 @@
+-***************
+-*** 1,5 ****
+-  /* mailbox.c -- Mailbox manipulation routines
+--  * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
+-   * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+-   *
+-   * Redistribution and use in source and binary forms, with or without
+---- 1,5 ----
+-  /* mailbox.c -- Mailbox manipulation routines
+-+  * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
+-   * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+-   *
+-   * Redistribution and use in source and binary forms, with or without