[mutt] 02/04: Switch to tokyocabinet (from qdbm) in hurd-i386

[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 d01eaf0ab1c80ee9b94cee6e44caced64e1ad65e
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Tue Jul 5 13:07:23 2016 +0300

    Switch to tokyocabinet (from qdbm) in hurd-i386
    
    It is nowadays available there too.
---
 debian/changelog | 2 ++
 debian/control   | 5 ++---
 debian/rules     | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1732970..da2fa61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ mutt (1.6.1-2) experimental; urgency=medium
     instead.
   * Remove mentions of gpg-2comp from gpg.rc and README.Debian and ship the
     resulting gpg.rc into /etc/Muttrc.d pristine, with the comments included.
+  * Switch to tokyocabinet (from qdbm) in hurd-i386 as well, as it is nowadays
+    available there too.
   * Remove postinst code that handles migrations from pre-1.5.20-9 versions,
     as it's too old (even wheezy shipped with 1.5.21-6.2).
   * Remove Conflicts/Replaces mutt-utf8, it was last shipped with version
diff --git a/debian/control b/debian/control
index 9a8441b..bf46351 100644
--- a/debian/control
+++ b/debian/control
@@ -17,12 +17,11 @@ Build-Depends: debhelper (>= 9), dh-autoreconf,
  libncurses5-dev,
  libncursesw5-dev,
  libsasl2-dev,
+ libtokyocabinet-dev,
  pkg-config,
  w3m,
  xsltproc,
- zlib1g-dev,
- libtokyocabinet-dev [!hurd-i386],
- libgdbm-dev [hurd-i386]
+ zlib1g-dev
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-mutt/mutt.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mutt/mutt.git
diff --git a/debian/rules b/debian/rules
index 32a52e0..6c9f096 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,6 @@ ifeq ($(HCACHE_DB),qdbm)
 endif
 ifeq ($(HCACHE_DB),tokyocabinet)
     hcache_db := --without-gdbm --without-bdb --without-qdbm
-    ifeq ($(shell dpkg --print-architecture),hurd-i386)
-	hcache_db := --without-bdb --without-qdbm
-    endif
 endif
 
 ###################### main ######################

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