[Pkg-samba-maint] r3494 - in branches/ldb: . experimental/debian

[jelmer at alioth.debian.org]

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

Added:
   branches/ldb/experimental/
Modified:
   branches/ldb/experimental/debian/build-orig.sh
   branches/ldb/experimental/debian/rules
Log:
Update for waf build.

Modified: branches/ldb/experimental/debian/build-orig.sh
===================================================================
--- trunk/ldb/debian/build-orig.sh	2010-02-03 15:26:23 UTC (rev 3268)
+++ branches/ldb/experimental/debian/build-orig.sh	2010-05-23 15:41:06 UTC (rev 3494)
@@ -1,31 +1,24 @@
 #!/bin/bash
-REFSPEC=$1
-GIT_URL=$2
+GIT_URL=$1
+REFSPEC=$2
 shift 2
 
 if [ -z "$GIT_URL" ]; then
 	GIT_URL=git://git.samba.org/samba.git
 fi
 
-if [ -z "$REFSPEC" ]; then
-	REFSPEC=origin/master
-fi
-
 LDBTMP=$TMPDIR/$RANDOM.ldb.git
-version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
-git clone --depth 1 -l $GIT_URL $LDBTMP
+git clone --depth 1 $GIT_URL $LDBTMP
 if [ ! -z "$REFSPEC" ]; then
 	pushd $LDBTMP
-	git checkout $REFSPEC
+	git checkout $REFSPEC || exit 1
 	popd
 fi
-
-mv $LDBTMP/source4/lib/ldb "ldb-$version"
-mv $LDBTMP/lib/replace "ldb-$version/libreplace"
-mv $LDBTMP/lib/tevent "ldb-$version/tevent"
-mv $LDBTMP/lib/tdb "ldb-$version/tdb"
-mv $LDBTMP/lib/talloc "ldb-$version/talloc"
+pushd $LDBTMP/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
 rm -rf $LDBTMP
-pushd "ldb-$version" && ./autogen.sh && popd
-tar cvz "ldb-$version" > "ldb_$version.orig.tar.gz"
-rm -rf "ldb-$version"

Modified: branches/ldb/experimental/debian/rules
===================================================================
--- trunk/ldb/debian/rules	2010-02-03 15:26:23 UTC (rev 3268)
+++ branches/ldb/experimental/debian/rules	2010-05-23 15:41:06 UTC (rev 3494)
@@ -17,7 +17,8 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-ldap=no
+	./autogen-waf.sh
+	PYTHON=`which python` PYTHON_CONFIG=`which python-config` CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-ldap=no --disable-rpath
 	touch configure-stamp
 
 get-orig-source: