[Pkg-samba-maint] [samba] 04/05: Disable ctdb support on non-linux

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

idd-guest pushed a commit to branch squeeze-backports
in repository samba.

commit 66f2125a02aa7edfa52bf38d00946e849ea158cc
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sun Oct 13 15:43:34 2013 +0200

    Disable ctdb support on non-linux
    
    The newer ctdb in squeeze-backports FTBFS on non-lunix.
    
    This reverts commit b8b445e8ff43f32b7b9dc522cf05ef679a9f5b4d "Enable ctdb for
    non-linux archs."
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc39308..8f93a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 samba (2:3.6.6-6+deb7u1~bpo60+1) UNRELEASED; urgency=low
 
   * Rebuild for squeeze-backports.
+  * Disable ctdb support on non-linux (ctdb FTBFS on non-linux in
+    squeeze-backports)
 
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Sun, 13 Oct 2013 15:38:28 +0200
 
diff --git a/debian/control b/debian/control
index e6f0033..3d6cc98 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8), libpam0g-dev, libreadline-dev,
 	libtdb-dev (>= 1.2.6~),
 	libcap-dev [linux-any],
 	libkeyutils-dev [linux-any],
-	libctdb-dev (>= 1.10+git20110412),
+	libctdb-dev (>= 1.10+git20110412) [linux-any],
 	pkg-config
 Build-Conflicts: libfam-dev,python-ldb,python-ldb-dev
 Standards-Version: 3.9.3
diff --git a/debian/rules b/debian/rules
index 941d2f7..1ea5647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,11 +52,11 @@ conf_args = \
 		--disable-avahi \
 		--without-libtdb \
 		--enable-external-libtdb \
-		--disable-smbtorture4 \
-		--with-ctdb=/usr --with-cluster-support=yes
+		--disable-smbtorture4
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \
+		--with-ctdb=/usr --with-cluster-support=yes \
 		--with-acl-support \
 		--with-quotas \
 		--without-cifsupcall          

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git