Update and enable NNTP patch

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

diff --git a/debian/patches/series b/debian/patches/series
index 6f73848ba0626ca730c4d6ca07185f6991aab37a..e788b3427e2b972e2f368c8da103509a7d11ca28 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +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/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
@@ -22,41 +20,54 @@ 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/467432-write_bcc.patch
+debian-specific/566076-build_doc_adjustments.patch
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 misc/smime.rc
 
 # 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
-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
-misc/hyphen-as-minus.patch
-#misc/manpage-typos.patch
-misc/smime_keys-manpage.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/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
 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
+# taken from http://mutt.org.ua/download/mutt-1.5.21/patch-1.5.21.vvv.nntp.gz
+mutt-patched/nntp
 
 # unapplied patches for custom packages
 # not-applied/chdir
 # not-applied/indexcolor
 # not-applied/w3mface
+# unapplied, not stable at the moment
+#mutt-patched/sidebar-newonly