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

[bubulle at alioth.debian.org]

tags 657314 pending
thanks

Author: bubulle
Date: 2012-05-09 19:51:24 +0000 (Wed, 09 May 2012)
New Revision: 4078

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
Log:
Build-Conflict with python-ldb and python-ldb-dev to avoid build
failures when some versions of these packages are locally installed.
Closes: #657314

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-09 18:44:46 UTC (rev 4077)
+++ trunk/samba/debian/changelog	2012-05-09 19:51:24 UTC (rev 4078)
@@ -29,6 +29,9 @@
     prefer this over removing the waf binary and repack upstream
     tarball.
     Closes: #654499
+  * Build-Conflict with python-ldb and python-ldb-dev to avoid build
+    failures when some versions of these packages are locally installed.
+    Closes: #657314
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 07 May 2012 22:16:32 +0200
 

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2012-05-09 18:44:46 UTC (rev 4077)
+++ trunk/samba/debian/control	2012-05-09 19:51:24 UTC (rev 4078)
@@ -13,7 +13,7 @@
 	libkeyutils-dev [linux-any],
 	libctdb-dev (>= 1.10+git20110412) [linux-any],
 	pkg-config
-Build-Conflicts: libfam-dev
+Build-Conflicts: libfam-dev,python-ldb,python-ldb-dev
 Standards-Version: 3.9.3
 Homepage: http://www.samba.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba/