upstream/533370-pgp-inline.patch: inline pgp messages now displayed correctly even...

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

diff --git a/debian/patches/series b/debian/patches/series
index 1683c6ca52b99c73e0e72a280cb8b2ca246ec5a0..f2607e809296eac66709f1448dd18adbb007dfb3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ debian-specific/sort-patchlist
 
 # features
 features/ifdef
-features/maildir-mtime
 features/xtitles
 features/trash-folder
 features/purge-message
@@ -23,37 +22,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
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 misc/smime.rc
 
-# 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
+# patches integrated from upstream mercurial
+# drop them with a new upstream release
 upstream/533209-mutt_perror.patch
-upstream/533459-unmailboxes
+upstream/533459-unmailboxes.patch
 upstream/533439-mbox-time.patch
 upstream/531430-imapuser.patch
+upstream/534543-imap-port.patch
 
+# the following two patches are also in upstream hg repo
+# plese drop them if there is a new release
+upstream/538128-mh-folder-access.patch
+upstream/537818-emptycharset.patch
+upstream/535096-pop-port.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
 
 mutt.org
 # extra patches for mutt-patched
-mutt-patched/sidebar-compat-revert.debian
 mutt-patched/sidebar
-mutt-patched/sidebar-compat-apply.debian
 mutt-patched/sidebar-dotted
 mutt-patched/sidebar-sorted