[Pkg-samba-maint] r3741 - branches/samba/experimental/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-04-16 15:05:45 +0000 (Sat, 16 Apr 2011)
New Revision: 3741

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/rules
Log:
Build against libctdb-dev (>= 1.10+git20110412) to have required control:
    CTDB_CONTROL_SCHEDULE_FOR_DELETION.


Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2011-04-16 14:39:35 UTC (rev 3740)
+++ branches/samba/experimental/debian/changelog	2011-04-16 15:05:45 UTC (rev 3741)
@@ -1,7 +1,12 @@
 samba (2:3.6.0~pre2-1) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   * New upstream release
 
+  [ Mathieu Parent ]
+  * Build against libctdb-dev (>= 1.10+git20110412) to have required control:
+    CTDB_CONTROL_SCHEDULE_FOR_DELETION. 
+
  -- Christian Perrier <bubulle at debian.org>  Fri, 15 Apr 2011 14:12:54 +0200
 
 samba (2:3.5.8~dfsg-1) unstable; urgency=low

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2011-04-16 14:39:35 UTC (rev 3740)
+++ branches/samba/experimental/debian/control	2011-04-16 15:05:45 UTC (rev 3741)
@@ -10,7 +10,7 @@
 	libtalloc-dev (>= 2.0.1-1~bpo50+1),
 	libcap-dev [linux-any],
 	libkeyutils-dev [linux-any],
-	ctdb (>= 1.0.103) [linux-any],
+	libctdb-dev (>= 1.10+git20110412) [linux-any],
 	pkg-config
 Build-Conflicts: libfam-dev
 Standards-Version: 3.9.0

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2011-04-16 14:39:35 UTC (rev 3740)
+++ branches/samba/experimental/debian/rules	2011-04-16 15:05:45 UTC (rev 3741)
@@ -64,7 +64,7 @@
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \
-		--with-ctdb --with-cluster-support=yes \
+		--with-ctdb=/usr --with-cluster-support=yes \
 		--with-acl-support \
 		--with-quotas \
 		--without-cifsmount \