[Pkg-openldap-devel] r814 - openldap/trunk-2.3/debian

[Russ Allbery]

Author: rra
Date: 2007-05-30 20:30:39 +0000 (Wed, 30 May 2007)
New Revision: 814

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/control
   openldap/trunk-2.3/debian/rules
Log:
* Update config.guess and config.sub during the build instead of in the
  clean target and remove them in the clean target for a clean diff.
  Build-depend on autotools-dev so that we can unconditionally copy over
  the latest versions.

Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-05-30 20:27:09 UTC (rev 813)
+++ openldap/trunk-2.3/debian/changelog	2007-05-30 20:30:39 UTC (rev 814)
@@ -14,10 +14,14 @@
     interface specifications, a comment explaining why this is needed, and
     a pointer to the relevant RFC.  (Closes: #361846)
   * Document the repackaging of the upstream source in debian/copyright.
+  * Update config.guess and config.sub during the build instead of in the
+    clean target and remove them in the clean target for a clean diff.
+    Build-depend on autotools-dev so that we can unconditionally copy over
+    the latest versions.
   * Added commentary and upstream ITS numbers for several patches
     applicable upstream.
 
- -- Russ Allbery <rra at debian.org>  Wed, 30 May 2007 13:20:41 -0700
+ -- Russ Allbery <rra at debian.org>  Wed, 30 May 2007 13:30:16 -0700
 
 openldap2.3 (2.3.30-5) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/control
===================================================================
--- openldap/trunk-2.3/debian/control	2007-05-30 20:27:09 UTC (rev 813)
+++ openldap/trunk-2.3/debian/control	2007-05-30 20:30:39 UTC (rev 814)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org>
 Uploaders: Roland Bauerschmidt <rb at debian.org>, Stephen Frost <sfrost at debian.org>, Steve Langasek <vorlon at debian.org>, Torsten Landschoff <torsten at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Russ Allbery <rra at debian.org>
-Build-Depends: libdb4.2-dev, libwrap0-dev, libiodbc2-dev, libsasl2-dev (>= 2.1.18-1), dpkg-dev (>= 1.7.1), libncurses5-dev, debconf-utils, debhelper (>= 4.1.16), libltdl3-dev (>= 1.4.3), libslp-dev, po-debconf, libssl-dev (>= 0.9.7), libperl-dev (>= 5.8.0), perl, quilt (>= 0.40), libtool, automake1.9, autoconf
+Build-Depends: libdb4.2-dev, libwrap0-dev, libiodbc2-dev, libsasl2-dev (>= 2.1.18-1), dpkg-dev (>= 1.7.1), libncurses5-dev, debconf-utils, debhelper (>= 4.1.16), libltdl3-dev (>= 1.4.3), libslp-dev, po-debconf, libssl-dev (>= 0.9.7), libperl-dev (>= 5.8.0), perl, quilt (>= 0.40), libtool, automake1.9, autoconf, autotools-dev
 Build-Conflicts: libbind-dev, bind-dev
 Standards-Version: 3.7.2.0
 

Modified: openldap/trunk-2.3/debian/rules
===================================================================
--- openldap/trunk-2.3/debian/rules	2007-05-30 20:27:09 UTC (rev 813)
+++ openldap/trunk-2.3/debian/rules	2007-05-30 20:30:39 UTC (rev 814)
@@ -43,6 +43,8 @@
 	    cp $$s servers/slapd/schema/`basename $$s`; \
 	done
 
+	cp -f /usr/share/misc/config.* build/
+	cp -f /usr/share/misc/config.* contrib/ldapc++/
 	mkdir -p $(builddir)
 	chmod 755 $(CURDIR)/autogen.sh
 	./autogen.sh
@@ -143,13 +145,9 @@
 	set -e; for s in debian/schema/*.schema debian/schema/*.ldif ; do \
 	    rm -f servers/slapd/schema/`basename $$s`; \
 	done
-	# Update config.guess and config.sub
-	if [ -e /usr/share/misc/config.sub ]; then \
-	  rm build/config.sub build/config.guess; \
-	  cp -f /usr/share/misc/config.* build/; \
-	  rm contrib/ldapc++/config.sub contrib/ldapc++/config.guess; \
-	  cp -f /usr/share/misc/config.* contrib/ldapc++/; \
-	fi
+	# 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)