X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/cefebddeeae89408bcf1b0474c5a734979e5e3ff..40dcc70d7c9189c0a005a79b9d5c0af31debd3a5:/debian/patches/series?ds=sidebyside

diff --git a/debian/patches/series b/debian/patches/series
index 3cb149e..6955698 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,25 +23,19 @@ 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
-upstream/fix-3271.diff
+# patches integrated from upstream mercurial
+# drop them with a new upstream release
+upstream/533209-mutt_perror.patch
+upstream/533459-unmailboxes.patch
+upstream/533439-mbox-time.patch
+upstream/531430-imapuser.patch
 
+# the following two patches are also in upstream hg repo
+# plese drop them if there is a new release
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
@@ -51,6 +45,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