[Pkg-samba-maint] r3725 - trunk/samba/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-03-26 19:23:23 +0000 (Sat, 26 Mar 2011)
New Revision: 3725

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
Log:
Builddep on ctdb-dev or ctdb < 1.10

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-03-26 18:56:01 UTC (rev 3724)
+++ trunk/samba/debian/changelog	2011-03-26 19:23:23 UTC (rev 3725)
@@ -1,11 +1,15 @@
 samba (2:3.5.8~dfsg-2) UNRELEASED; urgency=low
 
+  [ Jelmer Vernooij ]
   * Add libwbclient-dev package.
   * Build against external libtdb.
   * Bump standards version to 3.9.1 (no changes).
 
- -- Jelmer Vernooij <jelmer at debian.org>  Sat, 12 Mar 2011 17:48:19 +0100
+  [ Mathieu Parent ]
+  * Builddep on ctdb-dev or ctdb < 1.10 
 
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 26 Mar 2011 19:48:00 +0100
+
 samba (2:3.5.8~dfsg-1) unstable; urgency=low
 
   * New upstream release. This fixes the following bugs:

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2011-03-26 18:56:01 UTC (rev 3724)
+++ trunk/samba/debian/control	2011-03-26 19:23:23 UTC (rev 3725)
@@ -11,7 +11,7 @@
 	libtdb-dev (>= 1.2.1~),
 	libcap-dev [linux-any],
 	libkeyutils-dev [linux-any],
-	ctdb (>= 1.0.103) [linux-any],
+	ctdb-dev [linux-any] | ctdb (>= 1.0.103) [linux-any], ctdb-dev [linux-any] | ctdb (<< 1.10) [linux-any],
 	pkg-config
 Build-Conflicts: libfam-dev
 Standards-Version: 3.9.1