Revert "Build without redis on Debian squeeze, Ubuntu Lucid"

This reverts commit ad2e8b3190adb77733a744a26a08927ed026396d.

We don't build for Debian squeeze and Ubuntu Lucid anymore, so this
hack is redundant.

Conflicts:
	debian/control
	debian/rules

diff --git a/debian/control b/debian/control
index 77801f8..acf2b60 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7),
        libwrap0-dev,
        libmemcached-dev,
        nettle-dev,
        libwrap0-dev,
        libmemcached-dev,
        nettle-dev,

-       libhiredis-dev|libmemcached5,
+       libhiredis-dev,

        libicu-dev
 
 Package: libyaz5
        libicu-dev
 
 Package: libyaz5

diff --git a/debian/rules b/debian/rules
index d788755..029f447 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ override_dh_auto_configure:
        dh_auto_configure -- \
                --enable-tcpd --with-xslt --with-gnutls --with-icu \
                --with-nettle \
        dh_auto_configure -- \
                --enable-tcpd --with-xslt --with-gnutls --with-icu \
                --with-nettle \

-               --with-memcached
+               --with-memcached --with-redis

 
 override_dh_strip:
        dh_strip --dbg-package=libyaz5-dbg
 
 override_dh_strip:
        dh_strip --dbg-package=libyaz5-dbg