removing patches that were applied usptream into 1.5.21

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

diff --git a/debian/patches/series b/debian/patches/series
index 4662794ac5cc8faf11bfa99aa86401a55c1dd7a6..35e8a26d961949ca5f42ed0b4821521f4741d0c2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,22 +1,61 @@
-features/maildir-mtime
-features/assumed-charset
-features/compressed-folders -p0
-features/compressed-folders.ranty-fix
-features/compressed-folders.debian
+# build system patches
+misc/am-maintainer-mode
 
+# 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-old/patch-1.5.5.1.nt.xtitles.3.ab.1
+features/compressed-folders
+features/compressed-folders.debian
 
-debian-specific/Md.Muttrc.diff 
-debian-specific/Md.sasl2_needs_md5.diff
-debian-specific/Md.etc_mailname_gethostbyname.diff
+# Debian config
+debian-specific/Muttrc
+debian-specific/Md.etc_mailname_gethostbyname.diff 
 debian-specific/use_usr_bin_editor.diff 
-debian-specific/dont_rebuild_po_files.diff 
-debian-specific/build_doc_adjustments.diff
 debian-specific/correct_docdir_in_man_page.diff 
-debian-specific/dont_document_not_present_features.diff -p0
+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
+
+# 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/578087-header-strchr.patch
+
+upstream/603288-split-fetches.patch
+upstream/path_max
+
+mutt.org
+# extra patches for mutt-patched
+mutt-patched/sidebar
+mutt-patched/sidebar-dotted
+mutt-patched/sidebar-sorted
 
-misc/define-pgp_getkeys_command.diff
-misc/autotools-update.diff -p0
+# not applying cleanly at the moment
+#mutt-patched/nntp
 
-# not-applied/patch-1.5.8.hr.sensible_browser_position.3
+# unapplied patches for custom packages
+# not-applied/chdir
+# not-applied/indexcolor
+# not-applied/w3mface
+# unapplied, not stable at the moment
+#mutt-patched/sidebar-newonly