6 files changed, 42 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 93f1ff8..6587c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+mailscripts (0.18-1) unstable; urgency=medium
+
+  * notmuch-extract-patch: rewrite:
+    - Split into notmuch-extract-patch(1) and mbox-extract-patch(1).
+    - Don't require -v when only one series in thread (Closes: #951218).
+      + When there is no -v, extract the patch series with the highest
+        reroll count that we see.
+    - New --trailers and --cover-letter-trailers features (Closes: #951211).
+      + --trailers is on by default; use --no-trailers to disable.
+    - Stop outputting message subjects on standard error.
+  * New dependencies on liblist-moreutils-perl, libmail-box-perl.
+  * mailscripts.el: instead of defaulting to passing --reroll-count=1 to
+    notmuch-extract-patch, don't pass any reroll count unless there is a
+    prefix arg.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 15 Feb 2020 15:10:56 -0700
+
+mailscripts (0.17-1) unstable; urgency=medium
+
+  * email-print-mime-structure: pass --disable-dirmngr to gpgsm and drop
+    <!nocheck> build-dep on dirmngr (Closes: #946111).
+    Thanks to Daniel Kahn Gillmor for a patch.
+  * New script: imap-dl (Closes: #940461).
+    Thanks to Daniel Kahn Gillmor and Jameson Rollins for the patch, and
+    others for testing out the new tool.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 14 Feb 2020 10:37:02 -0700
+
 mailscripts (0.16-1~bpo10+1) buster-backports; urgency=medium
 
   * Rebuild for buster-backports.
diff --git a/debian/control b/debian/control
index d4ed7d3..260db76 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends:
  bash-completion,
  debhelper (>= 10),
  dh-elpa,
- dirmngr <!nocheck>,
  gnutls-bin <!nocheck>,
  gpg <!nocheck>,
  gpg-agent <!nocheck>,
@@ -41,6 +40,8 @@ Depends:
  libconfig-tiny-perl,
  libfile-which-perl,
  libipc-system-simple-perl,
+ liblist-moreutils-perl,
+ libmail-box-perl,
  libmime-tools-perl,
  python3,
  ${misc:Depends},
@@ -70,6 +71,8 @@ Description: collection of scripts for manipulating e-mail on Debian
  .
  notmuch-extract-patch -- extract a git patch series from notmuch
  .
+ mbox-extract-patch -- extract a git patch series from an mbox
+ .
  maildir-import-patch -- import a git patch series into a maildir
  .
  notmuch-import-patch -- import a git patch series into notmuch
@@ -77,3 +80,5 @@ Description: collection of scripts for manipulating e-mail on Debian
  email-print-mime-structure -- tree view of a message's MIME structure
  .
  email-extract-openpgp-certs -- extract OpenPGP certificates from a message
+ .
+ imap-dl -- download messages from an IMAP mailbox to a maildir
diff --git a/debian/copyright b/debian/copyright
index f6f2e0e..17997a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,8 @@
 mailscripts
 Collection of scripts for manipulating e-mail on Debian
 
-Copyright (C)2017 Aurelien Aptel
-Copyright (C)2017-2019 Sean Whitton
-Copyright (C)2019 Daniel Kahn Gillmor
+Copyright (C)2017-2020 Sean Whitton
+Copyright (C)2019-2020 Daniel Kahn Gillmor
 
 These programs are free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -19,10 +18,6 @@ A copy of the GNU General Public License v3 can be found in
 /usr/share/common-licenses/GPL-3.
 
 
-The contents of the notmuch-extract-patch/ directory was imported from
-https://github.com/aaptel/notmuch-extract-patch/ using git-subtree(1)
-
-
 Contributions are accepted upstream under the same terms (or another
 DFSG-compatible license for completely new scripts); please sign off
 your patches (by writing an approprite Signed-Off-By tag in your
diff --git a/debian/mailscripts.bash-completion b/debian/mailscripts.bash-completion
index 435576f..657de01 100644
--- a/debian/mailscripts.bash-completion
+++ b/debian/mailscripts.bash-completion
@@ -1 +1,2 @@
 completions/bash/email-print-mime-structure
+completions/bash/imap-dl
diff --git a/debian/mailscripts.install b/debian/mailscripts.install
index 2c060df..df220b3 100644
--- a/debian/mailscripts.install
+++ b/debian/mailscripts.install
@@ -1,8 +1,10 @@
 email-extract-openpgp-certs /usr/bin
 email-print-mime-structure /usr/bin
+imap-dl /usr/bin
 maildir-import-patch /usr/bin
 mbox2maildir /usr/bin
 mdmv /usr/bin
-notmuch-extract-patch/notmuch-extract-patch /usr/bin
+mbox-extract-patch /usr/bin
+notmuch-extract-patch /usr/bin
 notmuch-import-patch /usr/bin
 notmuch-slurp-debbug /usr/bin
diff --git a/debian/mailscripts.manpages b/debian/mailscripts.manpages
index 1de088f..345053a 100644
--- a/debian/mailscripts.manpages
+++ b/debian/mailscripts.manpages
@@ -1,8 +1,10 @@
 email-extract-openpgp-certs.1
 email-print-mime-structure.1
+imap-dl.1
 maildir-import-patch.1
 mbox2maildir.1
 mdmv.1
+mbox-extract-patch.1
 notmuch-extract-patch.1
 notmuch-import-patch.1
 notmuch-slurp-debbug.1