Merge branch '531430+imapuser'

diff --git a/debian/changelog b/debian/changelog
index e093372bcdc8fed98d501fd32740adb75d6b619d..9273c93f5ecb043f48557f7e32beecaff1e6ebf9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mutt (1.5.20-2) unstable; urgency=low
   * debian/patches/series:
     + upstream/533209-mutt_perror.patch: better error reporting if a mailbox
       cannot be opened (Closes: 533209)
-    + upstream/533459-unmailboxes: fixes the segfault with the unmailboxes 
+    + upstream/533459-unmailboxes.patch: fixes a segfault with the unmailboxes 
       command (Closes: 533459)
     + upstream/533439-mbox-time.patch: do not corrupt the atime/mtime of 
       mboxes when opened (Closes: 533439)

diff --git a/debian/patches/series b/debian/patches/series
index 1683c6ca52b99c73e0e72a280cb8b2ca246ec5a0..e0b2619f18161f4d839c2931c1038899d126e7bc 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,7 +41,7 @@ misc/smime.rc
 #upstream/504530-stunnel-account_hook-doc.patch
 #upstream/530887-dovecot-imap.patch
 upstream/533209-mutt_perror.patch
-upstream/533459-unmailboxes
+upstream/533459-unmailboxes.patch
 upstream/533439-mbox-time.patch
 upstream/531430-imapuser.patch
 

diff --git a/debian/patches/upstream/533459-unmailboxes b/debian/patches/upstream/533459-unmailboxes.patch
similarity index 100%
rename from debian/patches/upstream/533459-unmailboxes
rename to debian/patches/upstream/533459-unmailboxes.patch