Merge from etch branch.

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

diff --git a/debian/patches/series b/debian/patches/series
index f699ac5cd6c2572f67f1853ce3a1144fe40ddbc2..07dcae70db94353bc55ca2bb5d9cdcb7c4a16255 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # compressed folders need an autotools rerun
 # compressed folders need an autotools rerun

-features/compressed-folders -p0
-features/compressed-folders.ranty-fix
+features/compressed-folders

 features/compressed-folders.debian
 
 # build system patches
 features/compressed-folders.debian
 
 # build system patches


@@ -8,7 +7,7 @@ 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/Md.sasl2_needs_md5.diff -p0
 debian-specific/dont_rebuild_po_files.diff -p0
 debian-specific/build_doc_adjustments.diff -p0

-misc/doc-fix-reldate.h-location
+debian-specific/sort-patchlist

 
 # features
 features/ifdef
 
 # features
 features/ifdef


@@ -16,14 +15,17 @@ features/maildir-mtime
 features/xtitles
 features/trash-folder
 features/purge-message
 features/xtitles
 features/trash-folder
 features/purge-message

+features/sensible_browser_position

 features-old/patch-1.5.4.vk.pgp_verbose_mime
 
 # Debian config
 features-old/patch-1.5.4.vk.pgp_verbose_mime
 
 # Debian config

-debian-specific/Md.Muttrc.diff -p0
+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 -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 -p0
 misc/gpg.rc-paths