[Pkg-openldap-devel] r1381 - in openldap/trunk/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-10-08 09:32:20 +0000 (Sat, 08 Oct 2011)
New Revision: 1381

Removed:
   openldap/trunk/debian/patches/add-autogen-sh
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/rules
Log:
Use dh_autoreconf instead of a locally-patched autogen.sh.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-10-05 20:36:41 UTC (rev 1380)
+++ openldap/trunk/debian/changelog	2011-10-08 09:32:20 UTC (rev 1381)
@@ -3,6 +3,7 @@
   * Drop explicit depends on libdb4.8, since we're now linking against
     libdb5.1.  Thanks to Peter Marschall for catching.  Closes: #621403
     again.
+  * Use dh_autoreconf instead of a locally-patched autogen.sh.
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 21 Aug 2011 11:25:07 -0700
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2011-10-05 20:36:41 UTC (rev 1380)
+++ openldap/trunk/debian/control	2011-10-08 09:32:20 UTC (rev 1381)
@@ -11,7 +11,7 @@
 Build-Depends: debhelper (>= 8.1.3), libdb5.1-dev, libgcrypt-dev,
  libgnutls-dev (>= 1.7), unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
- libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40),
+ libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40), dh-autoreconf
  autotools-dev, libtool, automake, autoconf, groff-base, time, heimdal-dev
 Build-Conflicts: libbind-dev, bind-dev, libicu-dev
 Standards-Version: 3.9.1

Deleted: openldap/trunk/debian/patches/add-autogen-sh
===================================================================
--- openldap/trunk/debian/patches/add-autogen-sh	2011-10-05 20:36:41 UTC (rev 1380)
+++ openldap/trunk/debian/patches/add-autogen-sh	2011-10-08 09:32:20 UTC (rev 1381)
@@ -1,38 +0,0 @@
-Add an autogen.sh script to run all of the autotools in the right order
-to regenerate the build machinery.  Needed since we have patches that
-modify the source for Autoconf.
-
-Debian-specific.
-
---- /dev/null
-+++ b/autogen.sh
-@@ -0,0 +1,29 @@
-+#!/bin/sh
-+#
-+# autogen.sh
-+
-+LIBTOOL=`which libtoolize`
-+AUTOCONF=`which autoconf`
-+ACLOCAL=`which aclocal`
-+
-+if [ ! -x $LIBTOOL ]; then
-+  echo "libtool doesn't exist! Please install libtool"
-+  exit 1
-+fi
-+
-+if [ ! -x $ACLOCAL ]; then
-+  echo "aclocal doesn't exist! Please install automake"
-+  exit 1
-+fi
-+
-+if [ ! -x $AUTOCONF ]; then
-+  echo "autoconf doesn't exist! Please install autoconf"
-+  exit 1
-+fi
-+
-+$LIBTOOL --copy --force
-+$ACLOCAL
-+$AUTOCONF
-+
-+exit 0
-+

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2011-10-05 20:36:41 UTC (rev 1380)
+++ openldap/trunk/debian/patches/series	2011-10-08 09:32:20 UTC (rev 1381)
@@ -1,6 +1,5 @@
 man-slapd 
 evolution-ntlm
-add-autogen-sh
 slapi-errorlog-file 
 ldapi-socket-place 
 wrong-database-location 

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2011-10-05 20:36:41 UTC (rev 1380)
+++ openldap/trunk/debian/rules	2011-10-08 09:32:20 UTC (rev 1381)
@@ -87,8 +87,8 @@
 	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
+
+	dh_autoreconf
 	cd $(builddir) && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
 		$(CONFIG) $(SYSTEM)
 	perl debian/check_config
@@ -206,11 +206,11 @@
 	        rm -f servers/slapd/schema/`basename $$s`; \
 	    done; \
 	fi
+
+	dh_autoreconf_clean
 	# 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 -rf $(builddir) $(builddir_notls) $(installdir)
-	rm -rf build/ltmain.sh autom4te.cache configure aclocal.m4
 
 	# Remove autogenerated links files
 	rm -f debian/libldap-2.4-2.links debian/libldap2-dev.links