Merge commit 'upstream/1.5.21'

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

diff --git a/debian/patches/series b/debian/patches/series
index 63d2298b8c80fa7689640e7a74371c7b8dd3296d..404ac0963c890050e70f11c954ce60432799d24d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,13 +2,13 @@
 misc/am-maintainer-mode
 misc/hg.pmdef.debugtime
 debian-specific/build_doc_adjustments.diff 
 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


@@ -34,9 +34,6 @@ upstream/533459-unmailboxes.patch
 upstream/533439-mbox-time.patch
 upstream/531430-imapuser.patch
 upstream/534543-imap-port.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/538128-mh-folder-access.patch
 upstream/537818-emptycharset.patch
 upstream/535096-pop-port.patch


@@ -54,7 +51,18 @@ upstream/548494-swedish-intl.patch
 upstream/553321-ansi-escape-segfault.patch
 upstream/553238-german-intl.patch
 upstream/557395-muttrc-crypto.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
+upstream/573823-imap_internal_date
+upstream/542344-dont_fold_From_

 
 

+upstream/path_max

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