X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/a68126c0642d9ea6881a17ba2b1ef9fe71c5d1e1..097d8d8b63b7a270ffe4581e895b9edff5124580:/debian/patches/series?ds=sidebyside

diff --git a/debian/patches/series b/debian/patches/series
index 0964941..16be46b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,20 +1,67 @@
-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
+misc/hg.pmdef.debugtime
+debian-specific/build_doc_adjustments.diff 
+debian-specific/sort-patchlist
 
+# features
+features/ifdef
+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.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
+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/533209-mutt_perror.patch
+upstream/533459-unmailboxes.patch
+upstream/533439-mbox-time.patch
+upstream/531430-imapuser.patch
+upstream/534543-imap-port.patch
+
+# the following two patches are also in upstream hg repo
+# plese drop them if there is a new release
+upstream/538128-mh-folder-access.patch
+upstream/537818-emptycharset.patch
+upstream/535096-pop-port.patch
+upstream/542910-search-segfault.patch
+upstream/533370-pgp-inline.patch
+upstream/533520-signature-highlight.patch
+upstream/393926-internal-viewer.patch
+upstream/543467-thread-segfault.patch
+upstream/544180-italian-yesorno.patch
+upstream/542817-smimekeys-tmpdir.patch
+upstream/544794-smtp-batch.patch
+misc/hyphen-as-minus.patch
+#misc/manpage-typos.patch
+misc/smime_keys-manpage.patch
+
+mutt.org
+# extra patches for mutt-patched
+mutt-patched/sidebar
+mutt-patched/sidebar-dotted
+mutt-patched/sidebar-sorted
+
+# not applying cleanly at the moment
+#mutt-patched/nntp
 
-misc/define-pgp_getkeys_command.diff
-#misc/autotools-update.diff
+# unapplied patches for custom packages
+# not-applied/chdir
+# not-applied/indexcolor
+# not-applied/w3mface
+mutt-patched/sidebar-newonly