[Pkg-Cyrus-imapd-Debian-devel] [SVN] r146 - trunk/cyrus-imapd-2.2.12/debian/patches

[pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org]

Author: sven
Date: 2005-05-25 00:12:56 +0200 (Wed, 25 May 2005)
New Revision: 146

Added:
   trunk/cyrus-imapd-2.2.12/debian/patches/40_rehash_fix_pathes.dpatch
Log:
For some unknown reason, SVN recognized 40_rehash_fix_pathes.dpatch as a =
binary file, re-adding it as a text file

Added: trunk/cyrus-imapd-2.2.12/debian/patches/40_rehash_fix_pathes.dpatc=
h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/patches/40_rehash_fix_pathes.dpatch	2=
005-05-24 22:10:00 UTC (rev 145)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/40_rehash_fix_pathes.dpatch	2=
005-05-24 22:12:56 UTC (rev 146)
@@ -0,0 +1,36 @@
+#! /bin/sh debian/dpatch-run
+## 40_rehash_fix_pathes.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.cNgMuy/cyrus-imapd=
-2.2.12/tools/rehash
+--- cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:56:53.000000000 +0200
++++ /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:57:53=
.429121575 +0200
+@@ -130,7 +130,7 @@
+ $imapdconf =3D shift || "/etc/imapd.conf";
+=20
+ $yn =3D "y";
+-$sievedir =3D "/usr/sieve";
++$sievedir =3D "/var/spool/sieve";
+ $nosievedir =3D 0;
+ $hashispool =3D 0;
+ $virtdomains =3D 0;
+@@ -165,7 +165,7 @@
+ }
+ close CONF;
+=20
+-if (! $conf) { $conf =3D "/var/imap"; }
++if (! $conf) { $conf =3D "/var/lib/cyrus"; }
+=20
+ if ($interactive) {
+     print "upgrade $conf? ";
+@@ -539,6 +539,7 @@
+ 	      or die "couldn't rename .$i/$s/$t to $s/$t";
+ 	  }
+ 	  closedir MV;
++	  rmdir ".$i/$s" or die "could not remove .$i/$s"
+ 	}
+ 	closedir SUB;
+ 	rmdir ".$i" or die "could not remove .$i";