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

[vorlon at alioth.debian.org]

tags 725824 pending
thanks

Author: vorlon
Date: 2013-10-09 06:10:44 +0000 (Wed, 09 Oct 2013)
New Revision: 1442

Removed:
   openldap/trunk/debian/autoreconf
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
Log:
Adjust dh_autoreconf usage to update all config.sub/config.guess
instances in the source, so that we can be forwards-compatible with new
ports.  Thanks to Colin Watson <cjwatson at ubuntu.com> for the patch.
Closes: #725824.

Deleted: openldap/trunk/debian/autoreconf
===================================================================
--- openldap/trunk/debian/autoreconf	2013-10-01 18:59:55 UTC (rev 1441)
+++ openldap/trunk/debian/autoreconf	2013-10-09 06:10:44 UTC (rev 1442)
@@ -1,2 +0,0 @@
-.
-contrib/ldapc++

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2013-10-01 18:59:55 UTC (rev 1441)
+++ openldap/trunk/debian/changelog	2013-10-09 06:10:44 UTC (rev 1442)
@@ -11,6 +11,10 @@
   [ Steve Langasek ]
   * Remove Stephen Frost from Uploaders, per discussion with him.  Thanks for
     your contributions, Stephen!
+  * Adjust dh_autoreconf usage to update all config.sub/config.guess
+    instances in the source, so that we can be forwards-compatible with new
+    ports.  Thanks to Colin Watson <cjwatson at ubuntu.com> for the patch.
+    Closes: #725824.
 
  -- Steve Langasek <vorlon at debian.org>  Sat, 03 Nov 2012 23:08:17 -0700
 

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2013-10-01 18:59:55 UTC (rev 1441)
+++ openldap/trunk/debian/rules	2013-10-09 06:10:44 UTC (rev 1442)
@@ -53,6 +53,15 @@
 %:
 	dh $@ --with quilt,autoreconf --builddirectory=$(builddir)
 
+# Only contrib/ldapc++ uses Automake, so special care is needed to update
+# config.guess and config.sub at the top level.
+autoreconf:
+	autoreconf -f -i . contrib/ldapc++
+	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub build/
+
+override_dh_autoreconf:
+	dh_autoreconf debian/rules -- autoreconf
+
 override_dh_auto_configure:
 	# Check if we include the RFCs, Internet-Drafts, or upstream schemas
 	# with RFC text (which are non DFSG-free).  You can set DFSG_NONFREE