[Pkg-samba-maint] r1446 - in trunk/ldb/debian: . patches

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2007-06-06 17:15:53 +0000 (Wed, 06 Jun 2007)
New Revision: 1446

Modified:
   trunk/ldb/debian/changelog
   trunk/ldb/debian/control
   trunk/ldb/debian/patches/solib.patch
Log:
Put libldb-dev in the libdevel section. 
Don't specify -shared when linking ldbadd, not sure why we did in the first place.


Modified: trunk/ldb/debian/changelog
===================================================================
--- trunk/ldb/debian/changelog	2007-06-05 18:17:24 UTC (rev 1445)
+++ trunk/ldb/debian/changelog	2007-06-06 17:15:53 UTC (rev 1446)
@@ -1,3 +1,10 @@
+ldb (0.9.0-2) unstable; urgency=low
+
+  * Put libldb-dev in libdevel section. (Closes: #427582)
+  * Don't build shared version of ldbadd. (Closes: #427527)
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Wed, 06 Jun 2007 19:14:39 +0200
+
 ldb (0.9.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #421573)

Modified: trunk/ldb/debian/control
===================================================================
--- trunk/ldb/debian/control	2007-06-05 18:17:24 UTC (rev 1445)
+++ trunk/ldb/debian/control	2007-06-06 17:15:53 UTC (rev 1446)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), tdb-dev (>= 1.1.0), libtalloc-dev, pkg-config, libpopt-dev, docbook-xsl, docbook-xml, xsltproc
+Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), tdb-dev (>= 1.1.0), libtalloc-dev, libtalloc1, pkg-config, libpopt-dev, docbook-xsl, docbook-xml, xsltproc
 Standards-Version: 3.7.2
 
 Package: libldb0
@@ -34,7 +34,7 @@
  This package contains bundled test and utility binaries
 
 Package: libldb-dev
-Section: libs
+Section: libdevel
 Architecture: any
 Depends: libc6-dev, libldb0 (= ${Source-Version}), libtalloc-dev, pkg-config
 Description: LDAP-like embedded database - development files

Modified: trunk/ldb/debian/patches/solib.patch
===================================================================
--- trunk/ldb/debian/patches/solib.patch	2007-06-05 18:17:24 UTC (rev 1445)
+++ trunk/ldb/debian/patches/solib.patch	2007-06-06 17:15:53 UTC (rev 1446)
@@ -63,15 +63,6 @@
  dirs:
  	@mkdir -p $(DIRS)
  
-@@ -99,7 +110,7 @@
- 	$(CC) -shared -Wl,-soname,libnss_ldb.so.2 -o lib/libnss_ldb.so.2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
- 
- bin/ldbadd: tools/ldbadd.o tools/cmdline.o $(LIBS)
--	$(CC) -o bin/ldbadd tools/ldbadd.o tools/cmdline.o $(LIB_FLAGS)
-+	$(CC) -shared -o bin/ldbadd tools/ldbadd.o tools/cmdline.o $(LIB_FLAGS)
- 
- bin/ldbsearch: tools/ldbsearch.o tools/cmdline.o $(LIBS)
- 	$(CC) -o bin/ldbsearch tools/ldbsearch.o tools/cmdline.o $(LIB_FLAGS)
 @@ -128,7 +139,7 @@
  examples/ldifreader: examples/ldifreader.o $(LIBS)
  	$(CC) -o examples/ldifreader examples/ldifreader.o $(LIB_FLAGS)