a better way of closing 603186 (sidebar-{sorted,dotted} documentation)

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

diff --git a/debian/patches/series b/debian/patches/series
index 2bce73dbfd6532dcd7541fc5180d0d83cf5b4d95..a767d629d4740aafde1c794fc87069bc36e56d58 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,35 +1,67 @@
-# compressed folders need an autotools rerun
-features/compressed-folders
-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
-debian-specific/sort-patchlist
-misc/doc-fix-reldate.h-location
+misc/am-maintainer-mode

 
 # features
 features/ifdef
 
 # features
 features/ifdef

-features/maildir-mtime

 features/xtitles
 features/trash-folder
 features/purge-message
 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.4.vk.pgp_verbose_mime

+features/compressed-folders
+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/dont_document_not_present_features.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/assumed_charset-compat

-misc/define-pgp_getkeys_command.diff -p0
+debian-specific/467432-write_bcc.patch
+debian-specific/566076-build_doc_adjustments.patch
+misc/define-pgp_getkeys_command.diff 

 misc/gpg.rc-paths
 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/537061-dont-recode-saved-attachments.patch
+upstream/608706-fix-spelling-errors.patch
+upstream/620854-pop3-segfault.patch
+
+upstream/path_max
+
+mutt.org
+# extra patches for mutt-patched
+mutt-patched/sidebar
+mutt-patched/sidebar-dotted
+mutt-patched/sidebar-sorted
+mutt-patched/multiple-fcc
+
+# not applying cleanly at the moment
+#mutt-patched/nntp

 
 # 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

+# unapplied, not stable at the moment
+#mutt-patched/sidebar-newonly