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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-10-09 04:29:30 +0000 (Sun, 09 Oct 2011)
New Revision: 1395

Modified:
   openldap/trunk/debian/rules
Log:
fix check for dfsg-nonfree schema files to check the contents instead of just
checking for existence, so that our dh_auto_configure target is idempotent.

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2011-10-09 04:26:53 UTC (rev 1394)
+++ openldap/trunk/debian/rules	2011-10-09 04:29:30 UTC (rev 1395)
@@ -56,9 +56,12 @@
 	# can not ship the RFCs in main so this test is here to make sure it
 	# does not get in by accident again. -- Torsten
 	if [ -z "$(DFSG_NONFREE)" ]; then \
-	    if [ -e doc/drafts ]; then exit 1; fi; \
-	    if [ -e doc/rfc ]; then exit 1; fi; \
-	    if [ -e servers/slapd/schema/core.schema ]; then exit 1; fi; \
+	    if [ -e doc/drafts ] || [ -e doc/rfc ]; then exit 1; fi; \
+	    if [ -e servers/slapd/schema/core.schema ] \
+	       && grep -q 'RFC 4519 definition' servers/slapd/schema/core.schema; \
+	    then \
+		exit 1; \
+	    fi; \
 	fi
 
 	# Copy our stripped schema versions into where upstream expects them.