now the patch is clean, it was pretty messed up before

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

diff --git a/debian/patches/series b/debian/patches/series
index 16a0bd47a32290055efbfd9ca9d4b5462fcf5b0f..55397bc7c5aacf8c08aa03a08c4a106ac1dd5b46 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
 # 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/maildir-mtime
 features/xtitles
 features/trash-folder
 features/purge-message
@@ -24,13 +24,40 @@ 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
+misc/hyphen-as-minus.patch
+#misc/manpage-typos.patch
+misc/smime_keys-manpage.patch
+
 mutt.org
 # extra patches for mutt-patched
-mutt-patched/sidebar-compat-revert.debian
-#mutt-patched/sidebar
-#mutt-patched/sidebar-compat-apply.debian
+mutt-patched/sidebar
+mutt-patched/sidebar-dotted
+mutt-patched/sidebar-sorted
+
+# not applying cleanly at the moment
+#mutt-patched/nntp
 
 # unapplied patches for custom packages
 # not-applied/chdir