[Pkg-openldap-devel] r1098 - in openldap/trunk/debian: . lintian-overrides

[rra at alioth.debian.org]

Author: rra
Date: 2008-02-14 18:56:51 +0000 (Thu, 14 Feb 2008)
New Revision: 1098

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/lintian-overrides/slapd
   openldap/trunk/debian/rules
Log:
* Add a stamp file for the configure rule to avoid rerunning configure
  needlessly.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-02-13 17:19:25 UTC (rev 1097)
+++ openldap/trunk/debian/changelog	2008-02-14 18:56:51 UTC (rev 1098)
@@ -18,6 +18,10 @@
     prevented the use of the {CLEARTEXT} password scheme with SASL.
     Closes LP: #191563.
 
+  [ Russ Allbery ]
+  * Add a stamp file for the configure rule to avoid rerunning configure
+    needlessly.
+
  -- Steve Langasek <vorlon at debian.org>  Sat, 09 Feb 2008 18:02:00 -0800
 
 openldap2.3 (2.4.7-5) unstable; urgency=low

Modified: openldap/trunk/debian/lintian-overrides/slapd
===================================================================
--- openldap/trunk/debian/lintian-overrides/slapd	2008-02-13 17:19:25 UTC (rev 1097)
+++ openldap/trunk/debian/lintian-overrides/slapd	2008-02-14 18:56:51 UTC (rev 1098)
@@ -9,4 +9,4 @@
 
 # libslapi is a special case, used only for writing extension modules for
 # slapd, and is therefore shipped with slapd.
-slapd: package-name-doesnt-match-sonames libslapi-2.4-2
+slapd: package-name-doesnt-match-sonames @LIBSLAPI@

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2008-02-13 17:19:25 UTC (rev 1097)
+++ openldap/trunk/debian/rules	2008-02-14 18:56:51 UTC (rev 1098)
@@ -65,7 +65,8 @@
 	rm -r openldap2.3_$(VERSION).orig
 	gzip -9 openldap2.3_$(VERSION).orig.tar
 
-$(builddir)/Makefile: patch
+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
@@ -92,11 +93,12 @@
 		$(CONFIG) $(SYSTEM)
 	perl debian/check_config
 	$(MAKE) -C $(builddir) depend
+	touch $@
 
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep:
-build-stamp: $(builddir)/Makefile
+build-stamp: configure-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS)
 	touch $@
 
@@ -170,7 +172,7 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f install-stamp build-stamp
+	rm -f install-stamp build-stamp configure-stamp
 	# Update translation templates for debconf
 	debconf-updatepo
 	# Remove our stripped schema from the upstream source area.