[Pkg-samba-maint] r1361 - in trunk/tdb/debian: . patches

Jelmer Vernooij ctrlsoft-guest at alioth.debian.org
Wed May 2 19:23:35 UTC 2007 

Author: ctrlsoft-guest
Date: 2007-05-02 19:23:35 +0000 (Wed, 02 May 2007)
New Revision: 1361

Modified:
   trunk/tdb/debian/changelog
   trunk/tdb/debian/control
   trunk/tdb/debian/patches/solib.patch
   trunk/tdb/debian/rules
   trunk/tdb/debian/tdb-dev.install
Log:
Some more fixes to get the package building.

Modified: trunk/tdb/debian/changelog
===================================================================
--- trunk/tdb/debian/changelog	2007-05-02 16:51:54 UTC (rev 1360)
+++ trunk/tdb/debian/changelog	2007-05-02 19:23:35 UTC (rev 1361)
@@ -1,10 +1,14 @@
 tdb (1.1.0-1) unstable; urgency=low
 
   * New upstream release.
+  	* Removes spinlock code. (Closes: #400802)
+    * References to tdb_lockkeys() were removed. (Closes: #309994)
+    * Provide tdb_chain(un)lock() functions. (Closes: #412817)
   * New maintainer. (Closes: #411687)
   * Drop dependency on gdbm-dev.
+  * Fix typo in copyright file. (Closes: #337506)
 
- -- Jelmer Vernooij <jelmer at samba.org>  Wed, 02 May 2007 18:50:36 +0200
+ -- Jelmer Vernooij <jelmer at samba.org>  Wed, 02 May 2007 20:02:08 +0200
 
 tdb (1.0.6-13) unstable; urgency=high
 

Modified: trunk/tdb/debian/control
===================================================================
--- trunk/tdb/debian/control	2007-05-02 16:51:54 UTC (rev 1360)
+++ trunk/tdb/debian/control	2007-05-02 19:23:35 UTC (rev 1361)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends: debhelper (>> 5.0.0), quilt
+Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40)
 Standards-Version: 3.7.2
 
 Package: libtdb1
@@ -28,7 +28,7 @@
  This package contains bundled test and utility binaries
 
 Package: tdb-dev
-Section: devellibs
+Section: libs
 Architecture: any
 Depends: libc6-dev, libtdb1 (= ${Source-Version})
 Description: Trivial Database - development files

Modified: trunk/tdb/debian/patches/solib.patch
===================================================================
--- trunk/tdb/debian/patches/solib.patch	2007-05-02 16:51:54 UTC (rev 1360)
+++ trunk/tdb/debian/patches/solib.patch	2007-05-02 19:23:35 UTC (rev 1361)
@@ -1,15 +1,15 @@
 diff -ur tdb-1.1.0/Makefile.in tdb-1.1.0-debian/Makefile.in
 --- tdb-1.1.0/Makefile.in	2007-05-02 18:09:33.000000000 +0200
-+++ tdb-1.1.0-debian/Makefile.in	2007-05-02 19:45:33.000000000 +0200
++++ tdb-1.1.0-debian/Makefile.in	2007-05-02 21:56:36.000000000 +0200
 @@ -27,7 +27,10 @@
  
  DIRS = bin common tools
  
 -all: showflags dirs $(PROGS)
-+SONAME = libtdb.so.1.0.0
++SONAME = libtdb.so.1
 +SOLIB = libtdb.so. at PACKAGE_VERSION@
 +
-+all: showflags dirs $(PROGS) $(SOLIB)
++all: showflags dirs $(PROGS) $(SOLIB) libtdb.a
  
  showflags:
  	@echo 'tdb will be compiled with flags:'
@@ -32,7 +32,7 @@
  dirs:
  	@mkdir -p $(DIRS)
  
-@@ -52,23 +62,27 @@
+@@ -52,23 +62,30 @@
  	cp $(PROGS) $(DESTDIR)$(bindir)
  	cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir)
  	cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
@@ -42,26 +42,29 @@
  	ar -rv libtdb.a $(TDB_OBJ)
  
 -bin/tdbtest$(EXEEXT): tools/tdbtest.o libtdb.a
++libtdb.so: $(SOLIB)
++	ln -s $< $@
++
 +$(SOLIB): $(TDB_OBJ:.o=.po)
 +	$(CC) -Wl,-soname,$(SONAME) -shared -o $@ $^
 +
-+bin/tdbtest$(EXEEXT): tools/tdbtest.o $(SOLIB)
++bin/tdbtest$(EXEEXT): tools/tdbtest.o libtdb.so
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
  
 -bin/tdbtool$(EXEEXT): tools/tdbtool.o libtdb.a
-+bin/tdbtool$(EXEEXT): tools/tdbtool.o $(SOLIB)
++bin/tdbtool$(EXEEXT): tools/tdbtool.o libtdb.so
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb
  
 -bin/tdbtorture$(EXEEXT): tools/tdbtorture.o libtdb.a
-+bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(SOLIB)
++bin/tdbtorture$(EXEEXT): tools/tdbtorture.o libtdb.so
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb
  
 -bin/tdbdump$(EXEEXT): tools/tdbdump.o libtdb.a
-+bin/tdbdump$(EXEEXT): tools/tdbdump.o $(SOLIB)
++bin/tdbdump$(EXEEXT): tools/tdbdump.o libtdb.so
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb
  
 -bin/tdbbackup$(EXEEXT): tools/tdbbackup.o libtdb.a
-+bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(SOLIB)
++bin/tdbbackup$(EXEEXT): tools/tdbbackup.o libtdb.so
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
  
  test: bin/tdbtorture$(EXEEXT)

Modified: trunk/tdb/debian/rules
===================================================================
--- trunk/tdb/debian/rules	2007-05-02 16:51:54 UTC (rev 1360)
+++ trunk/tdb/debian/rules	2007-05-02 19:23:35 UTC (rev 1361)
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 CFLAGS = -g -Wall
 
@@ -17,20 +15,16 @@
 configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
-					   --disable-dependency-tracking \
-					   --enable-shared \
-					   --enable-static
+	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
 	touch configure-stamp
 
-build: configure-stamp build-stamp
+build: configure build-stamp
 build-stamp:
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
 
 clean: clean-patched unpatch
-
 clean-patched:
 	dh_testdir
 	dh_testroot
@@ -46,6 +40,8 @@
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	mv $(CURDIR)/debian/tmp/usr/bin/tdbbackup \
 		$(CURDIR)/debian/tmp/usr/bin/tdbbackup.tdbtools
+	ln -s libtdb.so.1.1.0 $(DESTDIR)/usr/lib/libtdb.so.1
+	ln -s libtdb.so.1 $(DESTDIR)/usr/lib/libtdb.so
 	dh_install --fail-missing --list-missing --sourcedir=$(DESTDIR)
 
 binary-indep: 
@@ -67,4 +63,4 @@
 	dh_builddeb
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install configure 

Modified: trunk/tdb/debian/tdb-dev.install
===================================================================
--- trunk/tdb/debian/tdb-dev.install	2007-05-02 16:51:54 UTC (rev 1360)
+++ trunk/tdb/debian/tdb-dev.install	2007-05-02 19:23:35 UTC (rev 1361)
@@ -1,6 +1,4 @@
 usr/include/*
 usr/lib/pkgconfig/tdb.pc
 usr/lib/lib*.a
-usr/lib/lib*.la
 usr/lib/lib*.so
-usr/share/man/man3/*

More information about the Pkg-samba-maint mailing list