Merge branch '1.5.20-1+fix533459'

[software/mutt-debian.git] / debian / patches / series

diff --git a/debian/patches/series b/debian/patches/series
index 33ecf6e3231b2b2d09502f30ac1030e70e218d2c..7dadcb72f5ef0898eacc24d2297a1a84563dee0c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,6 +40,9 @@ misc/smime.rc
 #upstream/502628-attach_charset-doc.patch
 #upstream/504530-stunnel-account_hook-doc.patch
 #upstream/530887-dovecot-imap.patch
 #upstream/502628-attach_charset-doc.patch
 #upstream/504530-stunnel-account_hook-doc.patch
 #upstream/530887-dovecot-imap.patch

+upstream/533209-mutt_perror.patch
+
+upstream/533459-unmailboxes

 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch


@@ -50,6 +53,11 @@ mutt.org
 mutt-patched/sidebar-compat-revert.debian
 mutt-patched/sidebar
 mutt-patched/sidebar-compat-apply.debian
 mutt-patched/sidebar-compat-revert.debian
 mutt-patched/sidebar
 mutt-patched/sidebar-compat-apply.debian

+mutt-patched/sidebar-dotted
+mutt-patched/sidebar-sorted
+
+# not applying cleanly at the moment
+#mutt-patched/nntp

 
 # unapplied patches for custom packages
 # not-applied/chdir
 
 # unapplied patches for custom packages
 # not-applied/chdir