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 f273707220437e579202363bd5152a2c635be9a7..25d22c803c7b59bc0206553ee4a2284d66c18ce4 100644 (file)
--- 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:
 mutt (1.5.20-8) unstable; urgency=low
 
   * debian/control:

diff --git a/debian/control b/debian/control
index 8368fcb8c45186e1a9e308882a05fcf4f444dd3e..18060d7a527d4c79cdfbde911e72897c2a162f6d 100644 (file)
--- 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,
 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,
  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
 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 (executable)
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 7db0d8fc32a793c8e39635d935c2616f7344e85e..0d6db9d6dd5ab88261d5095b637403bf7392141c 100755 (executable)
--- 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
 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                   \
 endif
 
 confflags =    --prefix=/usr                   \