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

[Steve Langasek]

Author: vorlon
Date: 2007-12-16 09:22:00 +0000 (Sun, 16 Dec 2007)
New Revision: 907

Added:
   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:
* reintroduce add-autogen-sh patch, with build deps on libtool, automake,
  and autoconf, required due to the previous patch; this time around, take
  care to clean up the autogenerated files in the clean target as well

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-16 09:20:17 UTC (rev 906)
+++ openldap/trunk/debian/changelog	2007-12-16 09:22:00 UTC (rev 907)
@@ -24,8 +24,11 @@
     process (as during a partial upgrade or the initial soname
     transition), and also when the library soname changes again in the
     future (as it's likely to do).
+  * reintroduce add-autogen-sh patch, with build deps on libtool, automake,
+    and autoconf, required due to the previous patch; this time around, take
+    care to clean up the autogenerated files in the clean target as well
 
- -- Steve Langasek <vorlon at debian.org>  Sun, 16 Dec 2007 01:07:16 -0800
+ -- Steve Langasek <vorlon at debian.org>  Sun, 16 Dec 2007 01:20:35 -0800
 
 openldap2.3 (2.3.39-1) unstable; urgency=medium
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2007-12-16 09:20:17 UTC (rev 906)
+++ openldap/trunk/debian/control	2007-12-16 09:22:00 UTC (rev 907)
@@ -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 (>= 5), libltdl3-dev (>= 1.4.3), libslp-dev, po-debconf, libssl-dev (>= 0.9.7), libperl-dev (>= 5.8.0), perl, quilt (>= 0.40), autotools-dev
+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 (>= 5), libltdl3-dev (>= 1.4.3), libslp-dev, po-debconf, libssl-dev (>= 0.9.7), libperl-dev (>= 5.8.0), perl, quilt (>= 0.40), autotools-dev, libtool, automake, autoconf
 Build-Conflicts: libbind-dev, bind-dev
 Standards-Version: 3.7.2.0
 Homepage: http://www.openldap.org/

Copied: openldap/trunk/debian/patches/add-autogen-sh (from rev 840, openldap/trunk-2.3/debian/patches/add-autogen-sh)
===================================================================
--- openldap/trunk/debian/patches/add-autogen-sh	                        (rev 0)
+++ openldap/trunk/debian/patches/add-autogen-sh	2007-12-16 09:22:00 UTC (rev 907)
@@ -0,0 +1,33 @@
+diff -urNad openldap2.3-2.3.11~/autogen.sh openldap2.3-2.3.11/autogen.sh
+--- openldap2.3-2.3.11~/autogen.sh	1970-01-01 01:00:00.000000000 +0100
++++ openldap2.3-2.3.11/autogen.sh	2005-12-24 16:37:21.693602500 +0100
+@@ -0,0 +1,29 @@
++#!/bin/sh
++#
++# autogen.sh
++
++LIBTOOL=`which libtoolize`
++AUTOCONF=`which autoconf`
++ACLOCAL=`which aclocal-1.9`
++
++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 automake1.9"
++  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	2007-12-16 09:20:17 UTC (rev 906)
+++ openldap/trunk/debian/patches/series	2007-12-16 09:22:00 UTC (rev 907)
@@ -2,6 +2,7 @@
 ntlm-ldap_h-hack -p0
 ntlm_c
 libldap-makefile_in
+add-autogen-sh
 slapi-errorlog-file -p0
 ldapi-socket-place -p0
 read-config-before-dropping-privileges -p0

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2007-12-16 09:20:17 UTC (rev 906)
+++ openldap/trunk/debian/rules	2007-12-16 09:22:00 UTC (rev 907)
@@ -51,6 +51,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
 	cd $(builddir) && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
 		$(CONFIG) 
 	perl debian/check_config
@@ -165,6 +167,7 @@
 	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