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 0669627f35afc02d9e4eabdf18effd1902bd5daf..3cee92af6ab7e74cdf215f80e93ed2b3e4f76bd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,18 +16,23 @@ features/compressed-folders.debian
 
 # Debian config
 debian-specific/Muttrc
 
 # Debian config
 debian-specific/Muttrc

-debian-specific/Md.etc_mailname_gethostbyname.diff -p0
-debian-specific/use_usr_bin_editor.diff -p0
-debian-specific/correct_docdir_in_man_page.diff -p0
+debian-specific/Md.etc_mailname_gethostbyname.diff 
+debian-specific/use_usr_bin_editor.diff 
+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/dont_document_not_present_features.diff 
 debian-specific/document_debian_defaults
 debian-specific/assumed_charset-compat

-misc/define-pgp_getkeys_command.diff -p0
+misc/define-pgp_getkeys_command.diff 

 misc/gpg.rc-paths
 
 misc/gpg.rc-paths
 

+# bug fixes
+upstream/489283-multipart-decoding
+

 mutt.org
 # extra patches for mutt-patched
 mutt.org
 # extra patches for mutt-patched

+mutt-patched/sidebar-compat-revert.debian

 mutt-patched/sidebar
 mutt-patched/sidebar

+mutt-patched/sidebar-compat-apply.debian

 
 # unapplied patches for custom packages
 # not-applied/chdir
 
 # unapplied patches for custom packages
 # not-applied/chdir