[Pkg-samba-maint] r3506 - branches/ldb/experimental/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-05-31 02:30:23 +0000 (Mon, 31 May 2010)
New Revision: 3506

Modified:
   branches/ldb/experimental/debian/changelog
   branches/ldb/experimental/debian/rules
Log:
Revert back to autoconf for now, build another 0.9.10 snapshot.

Modified: branches/ldb/experimental/debian/changelog
===================================================================
--- branches/ldb/experimental/debian/changelog	2010-05-30 23:55:17 UTC (rev 3505)
+++ branches/ldb/experimental/debian/changelog	2010-05-31 02:30:23 UTC (rev 3506)
@@ -1,4 +1,4 @@
-ldb (1:0.9.11~git20100522-1) experimental; urgency=low
+ldb (1:0.9.10~git20100522-1) experimental; urgency=low
 
   * New upstream snapshot.
 

Modified: branches/ldb/experimental/debian/rules
===================================================================
--- branches/ldb/experimental/debian/rules	2010-05-30 23:55:17 UTC (rev 3505)
+++ branches/ldb/experimental/debian/rules	2010-05-31 02:30:23 UTC (rev 3506)
@@ -13,9 +13,8 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./autogen-waf.sh
-	PYTHON=`which python` PYTHON_CONFIG=`which python-config` CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-rpath --disable-rpath-install \
-		--bundled-libraries=NONE
+	./autogen.sh
+	PYTHON=`which python` PYTHON_CONFIG=`which python-config` CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-rpath --disable-rpath-install
 	touch configure-stamp
 
 get-orig-source:
@@ -34,9 +33,9 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(DESTDIR)
-	# Work around waf bug
-	mv $(DESTDIR)/usr/include/ldb.inst.h $(DESTDIR)/usr/include/ldb.h
 	# Don't install ldbtest
+	ln -s libldb.so.0.9.10 $(DESTDIR)/usr/lib/libldb.so.0
+	ln -s libldb.so.0.9.10 $(DESTDIR)/usr/lib/libldb.so
 	rm -f $(DESTDIR)/usr/bin/ldbtest
 	dh_install --fail-missing --list-missing --sourcedir=$(DESTDIR)