Introduce two new patches that revert the conflicting part of the

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

diff --git a/debian/patches/series b/debian/patches/series
index e7726b583c63ba6d2b1f4e57ad2d0df5cde2930e..3cee92af6ab7e74cdf215f80e93ed2b3e4f76bd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,22 +1,40 @@
-version.diff
+# build system patches
+misc/am-maintainer-mode
+debian-specific/build_doc_adjustments.diff 
+debian-specific/sort-patchlist

 
 

+# features
+features/ifdef

 features/maildir-mtime
 features/maildir-mtime

-features/assumed-charset
+features/xtitles
+features/trash-folder
+features/purge-message
+features/sensible_browser_position
+features-old/patch-1.5.4.vk.pgp_verbose_mime

 features/compressed-folders
 features/compressed-folders

-features/compressed-folders.ranty-fix

 features/compressed-folders.debian
 
 features/compressed-folders.debian
 

-features-old/patch-1.5.4.vk.pgp_verbose_mime
-features-old/patch-1.5.5.1.nt.xtitles.3.ab.1
-
-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/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/correct_docdir_in_man_page.diff 

-debian-specific/dont_document_not_present_features.diff
+debian-specific/dont_document_not_present_features.diff 
+debian-specific/document_debian_defaults
+debian-specific/assumed_charset-compat
+misc/define-pgp_getkeys_command.diff 
+misc/gpg.rc-paths
+
+# bug fixes
+upstream/489283-multipart-decoding
+
+mutt.org
+# extra patches for mutt-patched
+mutt-patched/sidebar-compat-revert.debian
+mutt-patched/sidebar
+mutt-patched/sidebar-compat-apply.debian

 
 

-misc/define-pgp_getkeys_command.diff
-misc/autotools-update.diff
+# unapplied patches for custom packages
+# not-applied/chdir
+# not-applied/indexcolor
+# not-applied/w3mface