Merge branch '531430+imapuser'

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

diff --git a/debian/patches/series b/debian/patches/series
index f1f7a210b66ddc1eaf4ae0eca56fc64ac6b2cdf7..e0b2619f18161f4d839c2931c1038899d126e7bc 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # build system patches
 misc/am-maintainer-mode
+misc/hg.pmdef.debugtime
 debian-specific/build_doc_adjustments.diff 
 debian-specific/sort-patchlist
 
@@ -22,16 +23,30 @@ debian-specific/correct_docdir_in_man_page.diff
 debian-specific/dont_document_not_present_features.diff 
 debian-specific/document_debian_defaults
 debian-specific/assumed_charset-compat
-debian-specific/529838-gnutls-autoconf.patch
+#debian-specific/529838-gnutls-autoconf.patch
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 misc/smime.rc
 
-upstream/500016-temp-cache-fix.patch
-upstream/508988-inode-sort.patch
-upstream/530661-mandatory-doubledash.patch
+# these should all be in 1.5.20
+#upstream/500016-temp-cache-fix.patch
+#upstream/508988-inode-sort.patch
+#upstream/530661-mandatory-doubledash.patch
+#upstream/375530-index-weirdness.patch
+#upstream/493719-segfault-imap-close.patch
+#upstream/514960-certificate-insecure-algorithm.patch
+#upstream/524420-segfault-reconnect-sasl.patch
+#upstream/350957-postponed-to-bcc.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.patch
+upstream/533439-mbox-time.patch
+upstream/531430-imapuser.patch
 
 misc/hyphen-as-minus.patch
+#misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
 
 mutt.org
@@ -39,6 +54,11 @@ mutt.org
 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