staging the nntp patch which is not applying cleanly at the moment

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

diff --git a/debian/patches/series b/debian/patches/series
index 099f86e3b9e7735b5b00b72719ff20c29879d9f8..e4998306b9af398a5483b04fd50c7a019f4e5372 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # build system patches
 misc/am-maintainer-mode
 # build system patches
 misc/am-maintainer-mode

+misc/hg.pmdef.debugtime

 debian-specific/build_doc_adjustments.diff 
 debian-specific/sort-patchlist
 
 debian-specific/build_doc_adjustments.diff 
 debian-specific/sort-patchlist
 


@@ -22,12 +23,28 @@ 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

+#debian-specific/529838-gnutls-autoconf.patch

 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 misc/smime.rc
 
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 misc/smime.rc
 

-upstream/500016-temp-cache-fix.patch
-upstream/508988-inode-sort.patch
+# these should all be in 1.5.20
+#upstream/500016-temp-cache-fix.patch
+#upstream/508988-inode-sort.patch
+#upstream/530661-mandatory-doubledash.patch
+#upstream/375530-index-weirdness.patch
+#upstream/493719-segfault-imap-close.patch
+#upstream/514960-certificate-insecure-algorithm.patch
+#upstream/524420-segfault-reconnect-sasl.patch
+#upstream/350957-postponed-to-bcc.patch
+#upstream/502628-attach_charset-doc.patch
+#upstream/504530-stunnel-account_hook-doc.patch
+#upstream/530887-dovecot-imap.patch
+upstream/533209-mutt_perror.patch
+
+misc/hyphen-as-minus.patch
+#misc/manpage-typos.patch
+misc/smime_keys-manpage.patch

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


@@ -35,6 +52,9 @@ mutt-patched/sidebar-compat-revert.debian
 mutt-patched/sidebar
 mutt-patched/sidebar-compat-apply.debian
 
 mutt-patched/sidebar
 mutt-patched/sidebar-compat-apply.debian
 

+# not applying cleanly at the moment
+mutt-patched/nntp
+

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