remove bogus file .pc/.version

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

diff --git a/debian/patches/series b/debian/patches/series
index 4c8455583fd895a16dfb82dfaf5ea7f68ad74f46..6955698ae84a7839ab5d2b1180b336b12d4fda71 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
 


@@ -24,12 +25,31 @@ debian-specific/document_debian_defaults
 debian-specific/assumed_charset-compat
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 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
+
+# the following two patches are also in upstream hg repo
+# plese drop them if there is a new release
+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.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-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
 # not-applied/chdir
 
 # unapplied patches for custom packages
 # not-applied/chdir