From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 23 Nov 2013 15:27:52 +0000 (+0100)
Subject: Explicitly build-depend and link against libgcrypt.
X-Git-Tag: cadaver-0.23.3-2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b47f43913e73e10a2c162e2013af2fc4b974f5ab;p=pkg-cadaver.git

Explicitly build-depend and link against libgcrypt.

The function is used by cadaver directly, causing a build failure with current
build tools.

Thanks to David Suárez for reporting this.
Closes: #720800
---

diff --git a/debian/changelog b/debian/changelog
index 03fc20a..0866e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cadaver (0.23.3-2) unstable; urgency=low
+
+  * debian/control, debian/rules:
+    - Explicitly build-depend and link against libgcrypt. The function is used
+      by cadaver directly, causing a build failure with current build tools.
+      Thanks to David Suárez for reporting this (Closes: #720800).
+
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 23 Nov 2013 16:27:43 +0100
+
 cadaver (0.23.3-1) unstable; urgency=low
 
   * New upstream version:
diff --git a/debian/control b/debian/control
index fa61358..8cdf85e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,14 @@ Source: cadaver
 Section: web
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libncurses5-dev, libxml2-dev, libreadline-dev | libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon27-gnutls-dev (>= 0.28)
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch,
+ autotools-dev,
+ libgcrypt11-dev,
+ libncurses5-dev,
+ libneon27-gnutls-dev (>= 0.28),
+ libreadline-dev | libreadline5-dev,
+ libxml2-dev,
+ zlib1g-dev (>= 1:1.1.3)
 Standards-Version: 3.8.3
 Homepage: http://www.webdav.org/cadaver/
 Vcs-Git: git://git.tokkee.org/pkg-cadaver.git
diff --git a/debian/rules b/debian/rules
index 906dba6..28bafc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,10 +32,11 @@ $(BUILDDIR)/config.status: configure $(DPATCH_STAMPFN)
 	done
 	
 	[ -e $(BUILDDIR) ] || mkdir $(BUILDDIR)
-	cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" ../../configure \
+	cd $(BUILDDIR) && ../../configure \
 			--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr --mandir=\$${prefix}/share/man \
-			--enable-warnings --enable-netrc --with-ssl=gnutls
+			--enable-warnings --enable-netrc --with-ssl=gnutls \
+			CFLAGS="$(CFLAGS)" LIBS="-lgcrypt"
 
 build: build-stamp