notmuch-extract-patch: rewrite & split out mbox-extract-patch

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

5 files changed, 22 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 102f687..aa988d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+mailscripts (0.18-1) UNRELEASED; 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.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 15 Feb 2020 09:06:56 -0700
+
 mailscripts (0.17-1) unstable; urgency=medium
 
   * email-print-mime-structure: pass --disable-dirmngr to gpgsm and drop
diff --git a/debian/control b/debian/control
index 21afa45..613335c 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,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 +72,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
diff --git a/debian/copyright b/debian/copyright
index f55e591..17997a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
 mailscripts
 Collection of scripts for manipulating e-mail on Debian
 
-Copyright (C)2017      Aurelien Aptel
-Copyright (C)2017-2019 Sean Whitton
+Copyright (C)2017-2020 Sean Whitton
 Copyright (C)2019-2020 Daniel Kahn Gillmor
 
 These programs are free software: you can redistribute it and/or
@@ -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.install b/debian/mailscripts.install
index 3739c49..df220b3 100644
--- a/debian/mailscripts.install
+++ b/debian/mailscripts.install
@@ -4,6 +4,7 @@ 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 a915617..345053a 100644
--- a/debian/mailscripts.manpages
+++ b/debian/mailscripts.manpages
@@ -4,6 +4,7 @@ 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