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 f699ac5cd6c2572f67f1853ce3a1144fe40ddbc2..3cee92af6ab7e74cdf215f80e93ed2b3e4f76bd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,7 @@
-# compressed folders need an autotools rerun
-features/compressed-folders -p0
-features/compressed-folders.ranty-fix
-features/compressed-folders.debian
-

 # build system patches
 # build system patches

-misc/autotools-update.diff
-debian-specific/Md.sasl2_needs_md5.diff -p0
-debian-specific/dont_rebuild_po_files.diff -p0
-debian-specific/build_doc_adjustments.diff -p0
-misc/doc-fix-reldate.h-location
+misc/am-maintainer-mode
+debian-specific/build_doc_adjustments.diff 
+debian-specific/sort-patchlist

 
 # features
 features/ifdef
 
 # features
 features/ifdef


@@ -16,19 +9,32 @@ features/maildir-mtime
 features/xtitles
 features/trash-folder
 features/purge-message
 features/xtitles
 features/trash-folder
 features/purge-message

+features/sensible_browser_position

 features-old/patch-1.5.4.vk.pgp_verbose_mime
 features-old/patch-1.5.4.vk.pgp_verbose_mime

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

 
 # Debian config
 
 # Debian config

-debian-specific/Md.Muttrc.diff -p0
-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/dont_document_not_present_features.diff -p0
-misc/define-pgp_getkeys_command.diff -p0
+debian-specific/Muttrc
+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
+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-patched/sidebar-compat-revert.debian
+mutt-patched/sidebar
+mutt-patched/sidebar-compat-apply.debian
+

 # unapplied patches for custom packages
 # unapplied patches for custom packages

-# not-applied/patch-1.5.8.hr.sensible_browser_position.3

 # not-applied/chdir
 # not-applied/indexcolor
 # not-applied/w3mface
 # not-applied/chdir
 # not-applied/indexcolor
 # not-applied/w3mface