X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/2e0e8a04378a2caacb666ec4ee7fc2205c4709b7..58dc6c781fe54b6cee5e95b85cecaddce760e7e0:/debian/patches/series

diff --git a/debian/patches/series b/debian/patches/series
index 13d5da8..9d5b9df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
 # build system patches
 misc/am-maintainer-mode
+misc/hg.pmdef.debugtime
 debian-specific/build_doc_adjustments.diff 
 debian-specific/sort-patchlist
 
 # features
 features/ifdef
-features/maildir-mtime
 features/xtitles
 features/trash-folder
 features/purge-message
@@ -22,31 +22,34 @@ 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
 
-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
+# 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
+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
 misc/hyphen-as-minus.patch
-misc/manpage-typos.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
+
+# not applying cleanly at the moment
+#mutt-patched/nntp
 
 # unapplied patches for custom packages
 # not-applied/chdir