[Debian-ha-maintainers] Bug#529819: Patch to fix FTBFS of csync2

[a.kumar at alumni.iitm.ac.in]

X-Loop
owner at bugs.debian.org: Resent-Date: Wed, 19 Aug 2009 03:30:01 +0000
Resent-Message-ID: <handler.529819.B529819.12506524846575 at bugs.debian.org>
Resent-Sender: owner at bugs.debian.org
X-Debian-PR-Message: followup 529819
X-Debian-PR-Package: csync2
X-Debian-PR-Keywords: 
X-Debian-PR-Source: csync2
Received: via spool by 529819-submit at bugs.debian.org id=B529819.12506524846575
          (code B ref 529819); Wed, 19 Aug 2009 03:30:01 +0000
Received: (at 529819) by bugs.debian.org; 19 Aug 2009 03:28:04 +0000
X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
	(2007-08-08) on rietz.debian.org
X-Spam-Level: 
X-Spam-Bayes: score:0.0000 Tokens: new, 25; hammy, 149; neutral, 51; spammy,
	2. spammytokens:0.993-1--37, 0.987-1--H*r:sk:1MdbpO-
	hammytokens:0.000-+--uploaders, 0.000-+--Maintainer, 0.000-+--builddepends,
	0.000-+--build-depends, 0.000-+--BuildDepends
X-Spam-Status: No, score=-6.2 required=4.0 tests=AWL,BAYES_00,
	MURPHY_DRUGS_REL8,VALID_BTS_CONTROL autolearn=ham
	version=3.2.3-bugs.debian.org_2005_01_02
Received: from mail02.ece.utexas.edu ([128.83.59.39] ident=postfix)
	by rietz.debian.org with esmtp (Exim 4.63)
	(envelope-from <a.kumar at alumni.iitm.ac.in>)
	id 1MdbqG-0001hS-Id; Wed, 19 Aug 2009 03:28:04 +0000
Received: from aceslinc.WORKGROUP (dhcp-53-177.ece.utexas.edu [146.6.53.177])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: kappaiah)
	by mail02.ece.utexas.edu (Postfix) with ESMTP id DCDE5AE1;
	Tue, 18 Aug 2009 22:28:03 -0500 (CDT)
Received: from kumar by aceslinc.WORKGROUP with local (Exim 4.69)
	(envelope-from <a.kumar at alumni.iitm.ac.in>)
	id 1MdbpO-0004oY-Gu; Tue, 18 Aug 2009 22:27:10 -0500
Date: Tue, 18 Aug 2009 22:27:10 -0500
From: Kumar Appaiah <a.kumar at alumni.iitm.ac.in>
To: 529819 at bugs.debian.org
Cc: 529819-submitter at bugs.debian.org
Message-ID: <20090819032710.GA18502 at 146653177.ece.utexas.edu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="EVF5PPMfhYS0aIcm"
Content-Disposition: inline
User-Agent: Mutt/1.5.18 (2008-05-17)


--EVF5PPMfhYS0aIcm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

tags 529819 + patch
thanks

Please find attached a simple patch to fix detection of gnutls which
fixes the FTBFS.

HTH and thanks.

Kumar

--EVF5PPMfhYS0aIcm
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="csync2_gnutls.diff"

diff -Nru --exclude changelog csync2-1.34/configure csync2-1.34/configure
--- csync2-1.34/configure	2007-07-24 16:04:25.000000000 -0500
+++ csync2-1.34/configure	2009-08-18 22:25:28.000000000 -0500
@@ -3836,7 +3836,7 @@
   else
     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
-    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
 
 
       ac_save_CFLAGS="$CFLAGS"
diff -Nru --exclude changelog csync2-1.34/debian/control csync2-1.34/debian/control
--- csync2-1.34/debian/control	2009-08-18 22:25:28.000000000 -0500
+++ csync2-1.34/debian/control	2009-08-18 22:25:28.000000000 -0500
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <nobse at debian.org>
-Build-Depends: debhelper (>= 4.0.0), librsync-dev, libsqlite0-dev, libgnutls-dev, bison, flex
+Build-Depends: debhelper (>= 4.0.0), librsync-dev, libsqlite0-dev, libgnutls-dev, bison, flex, pkg-config
 Standards-Version: 3.8.0
 
 Package: csync2
diff -Nru --exclude changelog csync2-1.34/debian/rules csync2-1.34/debian/rules
--- csync2-1.34/debian/rules	2009-08-18 22:25:28.000000000 -0500
+++ csync2-1.34/debian/rules	2009-08-18 22:25:28.000000000 -0500
@@ -21,7 +21,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure
+	LIBGNUTLS_CONFIG="/usr/bin/pkg-config gnutls" ./configure
 	touch configure-stamp
 
 build: build-stamp

--EVF5PPMfhYS0aIcm--