[mutt] 04/07: Fold mutt-kz into mutt, as neomutt now ships that

[Faidon Liambotis]

This is an automated email from the git hooks/post-receive script.

paravoid pushed a commit to branch experimental
in repository mutt.

commit 5a4268c785976c5f771a8d765afc071e36a014a3
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Fri Jul 8 15:54:05 2016 +0300

    Fold mutt-kz into mutt, as neomutt now ships that
    
    Similarly, fold mutt-kz, a binary from a different source package until
    now, into mutt. mutt-kz upstream has joined forces with NeoMutt, so this
    is now a matter of just passing --enable-notmuch to our ./configure.
---
 debian/NEWS      | 11 +++++------
 debian/changelog |  3 +++
 debian/control   |  6 ++++--
 debian/rules     |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index b70a865..0be8740 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,11 +1,10 @@
 mutt (1.6.1-2) experimental; urgency=medium
 
-  The mutt-patched package has been dropped and all of its functionality has
-  been incorporated into the main mutt package and binary. Moreover, the
-  NeoMutt patchset has been fully applied to mutt, which includes a number of
-  important security, performance and stability fixes, as well as new
-  features, in comparison to both upstream mutt and to the heavily modified
-  version Debian has been shipping.
+  Both the mutt-patched and the mutt-kz packages have been dropped and their
+  functionality has been incorporated into the main mutt binary and package.
+  Moreover, the package now ships with the NeoMutt patchset, which includes a
+  number of important security, performance and stability fixes, as well as UI
+  improvements and a plethora of new features.
 
  -- Faidon Liambotis <paravoid at debian.org>  Mon, 04 Jul 2016 17:44:52 +0300
 
diff --git a/debian/changelog b/debian/changelog
index 1736ee0..7b778f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ mutt (1.6.1-2) experimental; urgency=medium
     - Add Breaks/Replaces: mutt-patched on the mutt binary package.
     - Remove mutt-patched rules from debian/rules.
     - Move multiple-fcc (the only remaining patch) under features/.
+  * Similarly, fold mutt-kz, a binary from a different source package until
+    now, into mutt. mutt-kz upstream has joined forces with NeoMutt, so this
+    is now a matter of just passing --enable-notmuch to our ./configure.
   * Update neomutt to a newer version, 20160611.
     - Enable *all* the neomutt patches now, not just a hand-picked selection.
     - Use the single patch, as the broken out patches conflict with each
diff --git a/debian/control b/debian/control
index d68318e..9a74560 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf,
  libgpgme11-dev,
  libidn11-dev,
  libkrb5-dev,
+ libnotmuch-dev,
  libncurses5-dev,
  libncursesw5-dev,
  libsasl2-dev,
@@ -33,8 +34,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: locales, mime-support, libsasl2-modules
 Suggests: default-mta | mail-transport-agent, urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates
 Provides: mail-reader, imap-client
-Breaks: mutt-patched
-Replaces: mutt-patched
+Breaks: mutt-patched, mutt-kz
+Replaces: mutt-patched, mutt-kz
 Description: text-based mailreader supporting MIME, GPG, PGP and threading
  Mutt is a sophisticated text-based Mail User Agent. Some highlights:
  .
@@ -56,5 +57,6 @@ Description: text-based mailreader supporting MIME, GPG, PGP and threading
   additional features compared to the stock Mutt. Among them are:
   * Support for compressed mailboxes.
   * Support for the NNTP (Usenet) protocol.
+  * Support for the notmuch mail indexer.
   * An optional Sidebar.
   * Various UI, security and performance fixes.
diff --git a/debian/rules b/debian/rules
index 543892d..f355d08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ override_dh_auto_configure:
 		--enable-pop			\
 		--enable-sidebar		\
 		--enable-nntp			\
+		--enable-notmuch		\
 						\
 		--with-curses			\
 		--with-gnutls			\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git