adding sidebar-dotted, sidebar-sorted (Closes: 523774), refreshed sidebar

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

diff --git a/debian/patches/series b/debian/patches/series
index 07dcae70db94353bc55ca2bb5d9cdcb7c4a16255..c0d3ad96462e95b578ac059f2b1ccb0d5cd75a46 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,7 @@
-# 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
+misc/am-maintainer-mode
+misc/hg.pmdef.debugtime
+debian-specific/build_doc_adjustments.diff 

 debian-specific/sort-patchlist
 
 # features
 debian-specific/sort-patchlist
 
 # features


@@ -17,20 +12,52 @@ features/trash-folder
 features/purge-message
 features/sensible_browser_position
 features-old/patch-1.5.4.vk.pgp_verbose_mime
 features/purge-message
 features/sensible_browser_position
 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/document_debian_defaults
 debian-specific/assumed_charset-compat

-misc/define-pgp_getkeys_command.diff -p0
+#debian-specific/529838-gnutls-autoconf.patch
+misc/define-pgp_getkeys_command.diff 

 misc/gpg.rc-paths
 misc/gpg.rc-paths

+misc/smime.rc
+
+# 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-patched/sidebar-compat-revert.debian
+mutt-patched/sidebar
+mutt-patched/sidebar-compat-apply.debian
+mutt-patched/sidebar-dotted
+mutt-patched/sidebar-sorted
+
+# 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