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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-10-09 01:08:01 +0000 (Sun, 09 Oct 2011)
New Revision: 1389

Removed:
   openldap/trunk/debian/check_config
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
Log:
Drop debian/check_config.  The upstream configure script now enforces
--with-cyrus-sasl, so there's no need for a second check.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-10-09 00:59:03 UTC (rev 1388)
+++ openldap/trunk/debian/changelog	2011-10-09 01:08:01 UTC (rev 1389)
@@ -15,6 +15,8 @@
     security, since this is a security-sensitive daemon dealing with
     untrusted input.  Ubuntu has been building with these flags for a
     while via hardening-wrappers, so the change is presumed safe.
+  * Drop debian/check_config.  The upstream configure script now enforces
+    --with-cyrus-sasl, so there's no need for a second check.
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 21 Aug 2011 11:25:07 -0700
 

Deleted: openldap/trunk/debian/check_config
===================================================================
--- openldap/trunk/debian/check_config	2011-10-09 00:59:03 UTC (rev 1388)
+++ openldap/trunk/debian/check_config	2011-10-09 01:08:01 UTC (rev 1389)
@@ -1,17 +0,0 @@
-#! /usr/bin/perl -w
-
-$| = 1;
-
-print "Reading configuration... ";
-open CONF, "<debian/build/config.status" or 
-	die "Can't open debian/build/config.status: $!";
- at CONF = <CONF>;
-close CONF;
-print "done\n";
-
-print "Checking if sasl2 was found... ";
-if (not grep /SASL_LIBS.*-lsasl2/, @CONF) {
-	print "no\n";
-	die "SASL2 support not enabled";
-}
-print "okay\n";

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2011-10-09 00:59:03 UTC (rev 1388)
+++ openldap/trunk/debian/rules	2011-10-09 01:08:01 UTC (rev 1389)
@@ -68,7 +68,6 @@
 	cp -f /usr/share/misc/config.* contrib/ldapc++/
 
 	dh_auto_configure -- $(CONFIG)
-	perl debian/check_config
 	$(MAKE) -C $(builddir) depend
 
 override_dh_auto_build: