sidebar patch applied, all old patches removed from series

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

diff --git a/debian/patches/series b/debian/patches/series
index 099f86e3b9e7735b5b00b72719ff20c29879d9f8..e6eedf90f64791d0d5ea5c1a6ded3cdf28538ce9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,12 @@
 # build system patches
 misc/am-maintainer-mode
-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
@@ -22,20 +20,40 @@ 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
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 misc/smime.rc
 
-upstream/500016-temp-cache-fix.patch
-upstream/508988-inode-sort.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/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
+
+# not applying cleanly at the moment
+#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