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

[jelmer at alioth.debian.org]

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

Modified:
   branches/ldb/experimental/debian/changelog
   branches/ldb/experimental/debian/rules
Log:
New upstream snapshot, switch back to waf.

Modified: branches/ldb/experimental/debian/changelog
===================================================================
--- branches/ldb/experimental/debian/changelog	2010-05-31 02:30:25 UTC (rev 3507)
+++ branches/ldb/experimental/debian/changelog	2010-05-31 02:30:26 UTC (rev 3508)
@@ -1,3 +1,9 @@
+ldb (1:0.9.10~git20100531-1) experimental; urgency=low
+
+  * New upstream snapshot, switch back to waf.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Mon, 24 May 2010 16:54:59 +0200
+
 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-31 02:30:25 UTC (rev 3507)
+++ branches/ldb/experimental/debian/rules	2010-05-31 02:30:26 UTC (rev 3508)
@@ -13,8 +13,9 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./autogen.sh
-	PYTHON=`which python` PYTHON_CONFIG=`which python-config` CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-rpath --disable-rpath-install
+	./autogen-waf.sh
+	PYTHON=`which python` PYTHON_CONFIG=`which python-config` CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-rpath --disable-rpath-install \
+		--bundled-libraries=NONE
 	touch configure-stamp
 
 get-orig-source:
@@ -33,9 +34,9 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(DESTDIR)
+	rm -f $(DESTDIR)//usr/lib/python*/*-packages/tdb.so
+	ar cr $(DESTDIR)/usr/lib/libldb.a bin/default/common/*.o
 	# 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)