[Pkg-samba-maint] r3477 - branches/tdb/experimental/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-05-13 16:45:35 +0000 (Thu, 13 May 2010)
New Revision: 3477

Removed:
   branches/tdb/experimental/debian/patches/
Modified:
   branches/tdb/experimental/debian/changelog
   branches/tdb/experimental/debian/control
   branches/tdb/experimental/debian/libtdb1.symbols
   branches/tdb/experimental/debian/rules
Log:
New upstream snapshot.

Modified: branches/tdb/experimental/debian/changelog
===================================================================
--- branches/tdb/experimental/debian/changelog	2010-05-13 16:45:29 UTC (rev 3476)
+++ branches/tdb/experimental/debian/changelog	2010-05-13 16:45:35 UTC (rev 3477)
@@ -1,3 +1,9 @@
+tdb (1.2.2~git20100507-1) lucid; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Fri, 07 May 2010 19:43:19 +0200
+
 tdb (1.2.1-2) unstable; urgency=low
 
   * Add missing build dependency on xsltproc, docbook-xsl. Closes:

Modified: branches/tdb/experimental/debian/control
===================================================================
--- branches/tdb/experimental/debian/control	2010-05-13 16:45:29 UTC (rev 3476)
+++ branches/tdb/experimental/debian/control	2010-05-13 16:45:35 UTC (rev 3477)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), python-central (>= 0.5.6), python-dev, xsltproc, docbook-xsl
+Build-Depends: debhelper (>> 5.0.0), python-central (>= 0.5.6), python-dev, xsltproc, docbook-xsl
 Homepage: http://tdb.samba.org/
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/tdb

Modified: branches/tdb/experimental/debian/libtdb1.symbols
===================================================================
--- branches/tdb/experimental/debian/libtdb1.symbols	2010-05-13 16:45:29 UTC (rev 3476)
+++ branches/tdb/experimental/debian/libtdb1.symbols	2010-05-13 16:45:35 UTC (rev 3477)
@@ -54,6 +54,7 @@
  tdb_transaction_prepare_commit at Base 1.1.5
  tdb_transaction_recover at Base 1.1.0
  tdb_transaction_start at Base 1.1.0
+ tdb_transaction_start_nonblock at Base 1.2.2~git20100507-1
  tdb_traverse at Base 1.0.6
  tdb_traverse_read at Base 1.1.0
  tdb_unlockall at Base 1.0.6

Modified: branches/tdb/experimental/debian/rules
===================================================================
--- branches/tdb/experimental/debian/rules	2010-05-13 16:45:29 UTC (rev 3476)
+++ branches/tdb/experimental/debian/rules	2010-05-13 16:45:35 UTC (rev 3477)
@@ -9,14 +9,13 @@
 CFLAGS += -O2
 endif
 
-include /usr/share/quilt/quilt.make
-
 DESTDIR=$(CURDIR)/debian/tmp
 
-configure: patch configure-stamp
+configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
+	./autogen-waf.sh
+	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-rpath
 	touch configure-stamp
 
 build: configure build-stamp
@@ -25,8 +24,7 @@
 	$(MAKE) all SHLD_FLAGS="$(SHLD_FLAGS)"
 	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -40,6 +38,8 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(DESTDIR)
+	ar cr libtdb.a bin/default/common/*.o
+	cp libtdb.a $(CURDIR)/debian/tmp/usr/lib
 	mv $(CURDIR)/debian/tmp/usr/bin/tdbbackup \
 		$(CURDIR)/debian/tmp/usr/bin/tdbbackup.tdbtools
 	mv $(CURDIR)/debian/tmp/usr/share/man/man8/tdbbackup.8 \