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

[rra at alioth.debian.org]

Author: rra
Date: 2008-07-14 01:16:06 +0000 (Mon, 14 Jul 2008)
New Revision: 1174

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
Log:
* Unless DFSG_NONFREE is set, also check whether the upstream schemas
  with RFC comments are included.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-07-14 01:12:12 UTC (rev 1173)
+++ openldap/trunk/debian/changelog	2008-07-14 01:16:06 UTC (rev 1174)
@@ -8,6 +8,8 @@
   [ Russ Allbery ]
   * Add Build-Depends on time, used by the test suite and only a shell
     built-in with bash.  Thanks, Daniel Schepler.  (Closes: #490754)
+  * Unless DFSG_NONFREE is set, also check whether the upstream schemas
+    with RFC comments are included.
 
  -- Steve Langasek <vorlon at debian.org>  Mon, 07 Jul 2008 00:10:16 -0700
 

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2008-07-14 01:12:12 UTC (rev 1173)
+++ openldap/trunk/debian/rules	2008-07-14 01:16:06 UTC (rev 1174)
@@ -68,14 +68,15 @@
 
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
-	# Check if we include the RFCs and Internet-Drafts (which are non
-	# DFSG-free).  You can set DFSG_NONFREE to build the packages from the
-	# unchanged upstream sources but Debian can not ship the RFCs in main
-	# so this test is here to make sure it does not get in by accident
-	# again. -- Torsten
+	# Check if we include the RFCs, Internet-Drafts, or upstream schemas
+	# with RFC text (which are non DFSG-free).  You can set DFSG_NONFREE
+	# to build the packages from the unchanged upstream sources but Debian
+	# 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; \
 	fi
 
 	# Copy our stripped schema versions into where upstream expects them.