a better way of closing 603186 (sidebar-{sorted,dotted} documentation)

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

diff --git a/debian/patches/series b/debian/patches/series
index 8f1ad7ed71a7a026fc240e88084dc4cd08fda194..a767d629d4740aafde1c794fc87069bc36e56d58 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,12 @@
 # build system patches
 misc/am-maintainer-mode
 # 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
 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
 features/sensible_browser_position
 features-old/patch-1.5.4.vk.pgp_verbose_mime
 features/compressed-folders


@@ -23,49 +21,40 @@ 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/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
 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/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/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/543467-thread-segfault.patch

-upstream/544180-italian-yesorno.patch

 upstream/542817-smimekeys-tmpdir.patch
 upstream/542817-smimekeys-tmpdir.patch

-upstream/544794-smtp-batch.patch

 upstream/537694-segv-imap-headers.patch
 upstream/548577-gpgme-1.2.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/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/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

 
 

-misc/hyphen-as-minus.patch
-#misc/manpage-typos.patch
-misc/smime_keys-manpage.patch
+upstream/path_max

 
 mutt.org
 # extra patches for mutt-patched
 mutt-patched/sidebar
 mutt-patched/sidebar-dotted
 mutt-patched/sidebar-sorted
 
 mutt.org
 # extra patches for mutt-patched
 mutt-patched/sidebar
 mutt-patched/sidebar-dotted
 mutt-patched/sidebar-sorted

+mutt-patched/multiple-fcc

 
 # not applying cleanly at the moment
 #mutt-patched/nntp
 
 # not applying cleanly at the moment
 #mutt-patched/nntp