[Pkg-openldap-devel] r1321 - openldap/trunk/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2010-09-12 22:41:23 +0000 (Sun, 12 Sep 2010)
New Revision: 1321

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
Log:
drop build-conflicts with libssl-dev; we explicitly pass
--with-tls=gnutls to configure, so there's no risk of a misbuild here.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-12 21:02:17 UTC (rev 1320)
+++ openldap/trunk/debian/changelog	2010-09-12 22:41:23 UTC (rev 1321)
@@ -13,6 +13,8 @@
   * debian/slapd.init: 'invoke-rc.d slapd stop' should not fail due to the
     absence of a slapd configuration; we should still exit 0 so that the
     package can be removed gracefully.  Closes: #596100.
+  * drop build-conflicts with libssl-dev; we explicitly pass
+    --with-tls=gnutls to configure, so there's no risk of a misbuild here.
 
   [ Matthijs Mohlmann ]
   * Remove upgrade_supported_from_backend, implemented patch from

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2010-09-12 21:02:17 UTC (rev 1320)
+++ openldap/trunk/debian/control	2010-09-12 22:41:23 UTC (rev 1321)
@@ -13,7 +13,7 @@
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40),
  autotools-dev, libtool, automake, autoconf, groff-base, time, heimdal-dev
-Build-Conflicts: libbind-dev, bind-dev, libicu-dev, libssl-dev
+Build-Conflicts: libbind-dev, bind-dev, libicu-dev
 Standards-Version: 3.9.1
 Homepage: http://www.openldap.org/
 Vcs-Svn: svn://svn.debian.org/pkg-openldap/openldap/trunk