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

[Russ Allbery]

Author: rra
Date: 2007-12-21 20:55:49 +0000 (Fri, 21 Dec 2007)
New Revision: 951

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
Log:
* debian/rules cleanup:
  - Fix patch dependencies for parallel build (hopefully).
  - Remove stamp files as the first step of the clean target.
  - Add trivial build-arch and build-indep targets.
  - Remove dead code and unnecessary comments.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-21 20:54:07 UTC (rev 950)
+++ openldap/trunk/debian/changelog	2007-12-21 20:55:49 UTC (rev 951)
@@ -77,11 +77,16 @@
     - Combine the NTLM patches for Evolution into a single patch.
     - Add explanatory comments to every patch.
     - Refresh all patches to remove diff garbage and trailing whitespace.
+  * debian/rules cleanup:
+    - Fix patch dependencies for parallel build (hopefully).
+    - Remove stamp files as the first step of the clean target.
+    - Add trivial build-arch and build-indep targets.
+    - Remove dead code and unnecessary comments.
   * Update Vcs-* headers for new repository layout.
   * Remove versioned dependency on an ancient dpkg-dev.
   * Wrap and reorder Build-Depends for readability.
 
- -- Russ Allbery <rra at debian.org>  Fri, 21 Dec 2007 12:39:24 -0800
+ -- Russ Allbery <rra at debian.org>  Fri, 21 Dec 2007 12:54:29 -0800
 
 openldap2.3 (2.3.39-1) unstable; urgency=medium
 

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2007-12-21 20:54:07 UTC (rev 950)
+++ openldap/trunk/debian/rules	2007-12-21 20:55:49 UTC (rev 951)
@@ -14,9 +14,9 @@
 INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
+    CFLAGS += -O0
 else
-CFLAGS += -O2
+    CFLAGS += -O2
 endif
 
 CONFIG		= $(shell grep -v "^\#" debian/configure.options)
@@ -30,7 +30,7 @@
 # Include the quilt patch system.
 include /usr/share/quilt/quilt.make
 
-$(builddir)/Makefile:
+$(builddir)/Makefile: patch
 	# 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
@@ -58,7 +58,9 @@
 	perl debian/check_config
 	$(MAKE) -C $(builddir) depend
 
-build: patch build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep:
 build-stamp: $(builddir)/Makefile
 	$(MAKE) -C $(builddir) $(MAKEVARS)
 	touch $@
@@ -87,30 +89,8 @@
 		| xargs perl -pi -e 's#(\.TH \w+ 8)C#$$1#'
 	touch $@
 
-
-binary: binary-arch 
-# Don't build binary-indep for now (only liblslapd-dev was in there)
-# Reenable after sarge...
-
-binary-indep: 
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	dh_installdirs -i
-	sh debian/copy_slapd_dev_files
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installdebconf -i
-	dh_installdeb -i
-	dh_compress -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	# Don't build the libslapd2.3-dev package so nobody builds against
-	# it. We'll support it after sarge release...
-	#dh_builddeb -i -Nlibslapd2.3-dev
-	dh_builddeb -i
-
+binary: binary-arch binary-indep
+binary-indep:
 binary-arch: install-stamp
 	dh_testdir
 	dh_testroot
@@ -128,8 +108,6 @@
 	dh_installman -a
 	dh_installinit -Xslapd.prerm -a -- "defaults 19 80"
 	dh_installdebconf -a
-	# when using OpenSSL, we do not need to add crontab entries
-	#dh_installcron -a
 	dh_strip -plibldap-2.4-2 --dbg-package=libldap-2.4-2-dbg
 	dh_strip -pslapd --dbg-package=slapd-dbg
 	dh_strip -pldap-utils
@@ -154,10 +132,10 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-clean: clean1 unpatch
-clean1:
+clean: unpatch
 	dh_testdir
 	dh_testroot
+	rm -f install-stamp build-stamp
 	# Update translation templates for debconf
 	debconf-updatepo
 	# Remove our stripped schema from the upstream source area.
@@ -169,10 +147,9 @@
 	# Remove updated config.guess and config.sub for a clean diff.
 	rm -f build/config.sub build/config.guess
 	rm -f contrib/ldapc++/config.sub contrib/ldapc++/config.guess
-	rm -f install-stamp build-stamp
 	rm -rf $(builddir) $(builddir_notls) $(installdir)
 	rm -rf build/ltmain.sh autom4te.cache configure aclocal.m4
-
 	dh_clean
 
-.PHONY: binary binary-arch binary-indep build clean
+.PHONY: binary binary-arch binary-indep build build-arch build-indep clean
+.PHONY: install