[Pkg-samba-maint] r1544 - trunk/tdb/debian/patches

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2007-11-06 18:58:23 +0000 (Tue, 06 Nov 2007)
New Revision: 1544

Removed:
   trunk/tdb/debian/patches/solib.patch
Modified:
   trunk/tdb/debian/patches/series
Log:
Remove patch, now upstream

Modified: trunk/tdb/debian/patches/series
===================================================================
--- trunk/tdb/debian/patches/series	2007-11-06 18:45:52 UTC (rev 1543)
+++ trunk/tdb/debian/patches/series	2007-11-06 18:58:23 UTC (rev 1544)
@@ -1 +0,0 @@
-solib.patch

Deleted: trunk/tdb/debian/patches/solib.patch
===================================================================
--- trunk/tdb/debian/patches/solib.patch	2007-11-06 18:45:52 UTC (rev 1543)
+++ trunk/tdb/debian/patches/solib.patch	2007-11-06 18:58:23 UTC (rev 1544)
@@ -1,70 +0,0 @@
-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 21:56:36.000000000 +0200
-@@ -27,7 +27,10 @@
- 
- DIRS = bin common tools
- 
--all: showflags dirs $(PROGS)
-+SONAME = libtdb.so.1
-+SOLIB = libtdb.so. at PACKAGE_VERSION@
-+
-+all: showflags dirs $(PROGS) $(SOLIB) libtdb.a
- 
- showflags:
- 	@echo 'tdb will be compiled with flags:'
-@@ -36,11 +39,18 @@
- 	@echo '  LDFLAGS = $(LDFLAGS)'
- 	@echo '  LIBS = $(LIBS)'
- 
-+.SUFFIXES: .c .o .po
-+
- .c.o:
- 	@echo Compiling $*.c
- 	@mkdir -p `dirname $@`
- 	@$(CC) $(CFLAGS) -c $< -o $@
- 
-+.c.po:
-+	@echo Compiling $*.c
-+	@mkdir -p `dirname $@`
-+	@$(CC) -fPIC $(CFLAGS) -c $< -o $@
-+
- dirs:
- 	@mkdir -p $(DIRS)
- 
-@@ -52,23 +62,30 @@
- 	cp $(PROGS) $(DESTDIR)$(bindir)
- 	cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir)
- 	cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
-+	cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir)
- 
- libtdb.a: $(TDB_OBJ)
- 	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 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 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 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 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 libtdb.so
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
- 
- test: bin/tdbtorture$(EXEEXT)