Merge from etch branch.

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

diff --git a/debian/patches/series b/debian/patches/series
index 89bf37c51ba27f55a2a1e45dca697f80516b777d..07dcae70db94353bc55ca2bb5d9cdcb7c4a16255 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,23 +1,36 @@
-features/maildir-mtime
-features/assumed-charset
-features/compressed-folders -p0
-features/compressed-folders.ranty-fix
+# compressed folders need an autotools rerun
+features/compressed-folders
 features/compressed-folders.debian
 
+# 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
+
+# features
+features/ifdef
+features/maildir-mtime
+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
 
-debian-specific/Md.Muttrc.diff 
-debian-specific/Md.sasl2_needs_md5.diff
-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 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/document_debian_defaults
+debian-specific/assumed_charset-compat
+misc/define-pgp_getkeys_command.diff -p0
+misc/gpg.rc-paths
 
-misc/define-pgp_getkeys_command.diff
-misc/autotools-update.diff -p0
-misc/fix-reldate-location.diff -p0
-
+# 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