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

diff --git a/debian/patches/series b/debian/patches/series
index 7dadcb7..49dac3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,12 @@
 # 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
+features/imap_fast_trash
 features/sensible_browser_position
 features-old/patch-1.5.4.vk.pgp_verbose_mime
 features/compressed-folders
@@ -23,38 +20,47 @@ 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/467432-write_bcc.patch
+debian-specific/566076-build_doc_adjustments.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/533209-mutt_perror.patch
+# patches integrated from upstream mercurial
+# drop them with a new upstream release
+upstream/531430-imapuser.patch
+upstream/537818-emptycharset.patch
+upstream/543467-thread-segfault.patch
+upstream/542817-smimekeys-tmpdir.patch
+#upstream/537694-segv-imap-headers.patch
+upstream/548577-gpgme-1.2.patch
+upstream/553321-ansi-escape-segfault.patch
+upstream/568295-references.patch
+upstream/547980-smime_keys-chaining.patch
+upstream/528233-readonly-open.patch
+upstream/228671-pipe-mime.patch
+upstream/383769-score-match.patch
+upstream/578087-header-strchr.patch
 
-upstream/533459-unmailboxes
-
-misc/hyphen-as-minus.patch
-#misc/manpage-typos.patch
-misc/smime_keys-manpage.patch
+upstream/603288-split-fetches.patch
+upstream/537061-dont-recode-saved-attachments.patch
+upstream/608706-fix-spelling-errors.patch
+upstream/620854-pop3-segfault.patch
+upstream/611412-bts-regexp.patch
+upstream/624058-gnutls-deprecated-set-priority.patch
+upstream/624085-gnutls-deprecated-verify-peers.patch
+upstream/584138-mx_update_context-segfault.patch
+upstream/619216-gnutls-CN-validation.patch
+upstream/611410-no-implicit_autoview-for-text-html.patch
+upstream/path_max
 
 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
+mutt-patched/sidebar-utf8
+mutt-patched/multiple-fcc
 
 # not applying cleanly at the moment
 #mutt-patched/nntp
@@ -63,3 +69,5 @@ mutt-patched/sidebar-sorted
 # not-applied/chdir
 # not-applied/indexcolor
 # not-applied/w3mface
+# unapplied, not stable at the moment
+#mutt-patched/sidebar-newonly