Fix segfaults with ssh tunnels, patch 228671-pipe-mime.patch updated. Thanks Nikolaus...

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

diff --git a/debian/patches/series b/debian/patches/series
index 3cb149eee2b9450a20ea91c60fe9629145492c8c..0389f2faffa55f93cafaa0633aff36ca0dd66ab2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ debian-specific/sort-patchlist
 
 # features
 features/ifdef
 
 # features
 features/ifdef

-features/maildir-mtime

 features/xtitles
 features/trash-folder
 features/purge-message
 features/xtitles
 features/trash-folder
 features/purge-message


@@ -23,24 +22,43 @@ 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/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

 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 misc/smime.rc
 
 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
+upstream/534543-imap-port.patch
+upstream/538128-mh-folder-access.patch
+upstream/537818-emptycharset.patch
+upstream/535096-pop-port.patch
+upstream/542910-search-segfault.patch
+upstream/533370-pgp-inline.patch
+upstream/533520-signature-highlight.patch
+upstream/393926-internal-viewer.patch
+upstream/543467-thread-segfault.patch
+upstream/544180-italian-yesorno.patch
+upstream/542817-smimekeys-tmpdir.patch
+upstream/544794-smtp-batch.patch
+upstream/537694-segv-imap-headers.patch
+upstream/548577-gpgme-1.2.patch
+upstream/548494-swedish-intl.patch
+upstream/553321-ansi-escape-segfault.patch
+upstream/553238-german-intl.patch
+upstream/557395-muttrc-crypto.patch
+upstream/545316-header-color.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/547739-manual-typos.patch
+upstream/311296-rand-mktemp.patch

 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch


@@ -48,11 +66,16 @@ misc/smime_keys-manpage.patch
 
 mutt.org
 # extra patches for mutt-patched
 
 mutt.org
 # extra patches for mutt-patched

-mutt-patched/sidebar-compat-revert.debian

 mutt-patched/sidebar
 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
 # not-applied/indexcolor
 # not-applied/w3mface
 
 # unapplied patches for custom packages
 # not-applied/chdir
 # not-applied/indexcolor
 # not-applied/w3mface

+# unapplied, not stable at the moment
+#mutt-patched/sidebar-newonly