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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-05-23 15:41:50 +0000 (Sun, 23 May 2010)
New Revision: 3495

Modified:
   branches/ldb/experimental/debian/build-orig.sh
   branches/ldb/experimental/debian/changelog
   branches/ldb/experimental/debian/rules
Log:
New upstream snapshot.

Modified: branches/ldb/experimental/debian/build-orig.sh
===================================================================
--- branches/ldb/experimental/debian/build-orig.sh	2010-05-23 15:41:06 UTC (rev 3494)
+++ branches/ldb/experimental/debian/build-orig.sh	2010-05-23 15:41:50 UTC (rev 3495)
@@ -14,11 +14,11 @@
 	git checkout $REFSPEC || exit 1
 	popd
 fi
-pushd $LDBTMP/lib/ldb
+pushd $LDBTMP/source4/lib/ldb
 ./autogen-waf.sh
 ./configure
 make dist
 popd
 version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
-mv $LDBTMP/lib/ldb/ldb-*.tar.gz ldb-$version.tar.gz
+mv $LDBTMP/source4/lib/ldb/ldb-*.tar.gz ldb_$version.orig.tar.gz
 rm -rf $LDBTMP

Modified: branches/ldb/experimental/debian/changelog
===================================================================
--- branches/ldb/experimental/debian/changelog	2010-05-23 15:41:06 UTC (rev 3494)
+++ branches/ldb/experimental/debian/changelog	2010-05-23 15:41:50 UTC (rev 3495)
@@ -1,3 +1,9 @@
+ldb (1:0.9.11~git20100522-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sun, 23 May 2010 15:50:20 +0200
+
 ldb (1:0.9.10~git20100203-1) unstable; urgency=low
 
   * New upstream snapshot.

Modified: branches/ldb/experimental/debian/rules
===================================================================
--- branches/ldb/experimental/debian/rules	2010-05-23 15:41:06 UTC (rev 3494)
+++ branches/ldb/experimental/debian/rules	2010-05-23 15:41:50 UTC (rev 3495)
@@ -18,7 +18,7 @@
 configure-stamp:
 	dh_testdir
 	./autogen-waf.sh
-	PYTHON=`which python` PYTHON_CONFIG=`which python-config` CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-ldap=no --disable-rpath
+	PYTHON=`which python` PYTHON_CONFIG=`which python-config` CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-rpath --disable-rpath-install
 	touch configure-stamp
 
 get-orig-source:
@@ -27,7 +27,7 @@
 build: configure build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) all build-python LDFLAGS="$(LDFLAGS)" SHLD_FLAGS="$(SHLD_FLAGS)"
+	$(MAKE)
 	touch build-stamp
 
 clean:
@@ -42,11 +42,9 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(DESTDIR)
+	DESTDIR=$(DESTDIR) $(MAKE) install
 	# Don't install ldbtest
 	rm -f $(DESTDIR)/usr/bin/ldbtest
-	ln -s libldb.so.$(version) $(DESTDIR)/usr/lib/libldb.so.0
-	ln -s libldb.so.0 $(DESTDIR)/usr/lib/libldb.so
 	dh_install --fail-missing --list-missing --sourcedir=$(DESTDIR)
 
 binary-indep: