From: Christoph Berg <myon@debian.org>
Date: Sun, 6 Jun 2010 11:08:35 +0000 (+0200)
Subject: hurd-i386 fixes
X-Git-Tag: debian/1.5.20-9~5
X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/9c212b64b670f5eedc8651d379ed587ce153ba11?ds=inline;hp=00c2c803b72b8c279b59ceb8b5fc71360a38fde7

hurd-i386 fixes

* hurd-i386 fixes:
  + Use libgdbm-dev for this arch until libtokyocabinet-dev is available.
---

diff --git a/debian/changelog b/debian/changelog
index f273707..25d22c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mutt (1.5.20-9~unrel) UNRELEASED; urgency=low
+
+  * hurd-i386 fixes:
+    + Use libgdbm-dev for this arch until libtokyocabinet-dev is available.
+
+ -- Christoph Berg <myon@debian.org>  Sun, 06 Jun 2010 12:58:59 +0200
+
 mutt (1.5.20-8) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 8368fcb..18060d7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ Priority: standard
 Maintainer: Antonio Radici <antonio@dyne.org>
 Uploaders: Christoph Berg <myon@debian.org>
 Build-Depends: automake, debhelper (>> 7), docbook-xml, docbook-xsl,
- elinks-lite | elinks, gawk, gettext, libtokyocabinet-dev, libgnutls-dev,
+ elinks-lite | elinks, gawk, gettext, libgnutls-dev,
  libgpgme11-dev, libidn11-dev, libkrb5-dev, libncurses5-dev, libncursesw5-dev,
- libsasl2-dev, pkg-config, quilt, xsltproc, zlib1g-dev
+ libsasl2-dev, pkg-config, quilt, xsltproc, zlib1g-dev,
+ libtokyocabinet-dev [!hurd-i386], libgdbm-dev [hurd-i386]
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-mutt/mutt.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mutt/mutt.git
diff --git a/debian/fix-PATCHES.pl b/debian/fix-PATCHES.pl
deleted file mode 100755
index fafd7b9..0000000
--- a/debian/fix-PATCHES.pl
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl -wi
-
-use strict;
-
-my ($PATCHES, @patches);
-while (<>) {
-	if (/^(---|Index:|diff) .*PATCHES/) {
-		$PATCHES = 1;
-	} elsif (/^(-|Index|diff)/) { # next patch
-		$PATCHES = 0;
-		print;
-	} elsif ($PATCHES) {
-		next if /^(===|\+\+\+|@@)/; # patch header
-		next if /^ /; # context
-		push @patches, $_;
-	} else {
-		print;
-	}
-	if (eof) {
-		if (@patches) {
-			print "--- a/PATCHES\n";
-			print "+++ b/PATCHES\n";
-			print "@@ -0,0 +" . scalar (@patches) . " @@\n";
-			print @patches;
-		}
-		@patches = ();
-		$PATCHES = 0;
-	}
-}
-
diff --git a/debian/rules b/debian/rules
index 7db0d8f..0d6db9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,9 @@ 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
 
 confflags =	--prefix=/usr			\