[Pkg-samba-maint] r1040 - branches/samba4

Thu Mar 23 00:15:54 UTC 2006

Author: ctrlsoft-guest
Date: 2006-03-23 00:15:53 +0000 (Thu, 23 Mar 2006)
New Revision: 1040

Added:
   branches/samba4/libldb-dev.install
   branches/samba4/libldb0.install
   branches/samba4/libtalloc-dev.install
   branches/samba4/libtalloc0.install
   branches/samba4/libtdb-dev.install
   branches/samba4/libtdb0.install
Modified:
   branches/samba4/changelog
   branches/samba4/control
   branches/samba4/rules
   branches/samba4/samba-common.install
   branches/samba4/samba.install
Log:
+  * Put ldb, tdb and talloc libraries into seperate binary packages.
 


Modified: branches/samba4/changelog
===================================================================

--- branches/samba4/changelog	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/changelog	2006-03-23 00:15:53 UTC (rev 1040)
@@ -6,8 +6,9 @@
   * Remove setntacl utility (it doesn't do anything).
   * Include oLschema2ldif.1 in the ldb-tools package.
   * Enable shared library building.
+  * Put ldb, tdb and talloc libraries into seperate binary packages.
 
- -- Jelmer Vernooij <jelmer at samba.org>  Wed, 22 Mar 2006 22:21:33 +0100
+ -- Jelmer Vernooij <jelmer at rhonwyn.lan.vernstok.nl>  Thu, 23 Mar 2006 01:13:32 +0100
 
 samba (3.9.1+4.0.0tp1-1) experimental; urgency=low
 

Modified: branches/samba4/control
===================================================================
--- branches/samba4/control	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/control	2006-03-23 00:15:53 UTC (rev 1040)
@@ -4,7 +4,7 @@
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Steinar H. Gunderson <sesse at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: libgtk2.0-dev, libgconf2-dev, debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev
+Build-Depends: libgtk2.0-dev, libgconf2-dev, debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev
 
 Package: samba
 Architecture: any
@@ -140,7 +140,7 @@
 
 Package: samba-dev
 Architecture: any
-Depends: libparse-pidl-perl, libc6-dev, pkg-config (>= 0.14.0)
+Depends: libparse-pidl-perl, libc6-dev, pkg-config (>= 0.14.0), libldb-dev,	libtdb-dev, libtalloc-dev
 Section: devel
 Description: tools for extending Samba
  The Samba software suite is a collection of programs that
@@ -194,3 +194,58 @@
  Tool. These are used by the embedded Samba 4 web server to provide web-based
  administration of shares and other settings.
 
+Package: libldb0
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Light-Weight Database
+ ldb is a LDAP-like embedded database. It provides a fast database with an 
+ LDAP-like API designed to be used within an application. In some ways it can 
+ be seen as a intermediate solution between key-value pair databases and a 
+ real LDAP database.
+
+Package: libldb-dev
+Architecture: all
+Depends: libldb0 (=${Source-Version}), libtdb-dev, libtalloc-dev
+Description: Light-Weight Database
+ ldb is a LDAP-like embedded database. It provides a fast database with an 
+ LDAP-like API designed to be used within an application. In some ways it can 
+ be seen as a intermediate solution between key-value pair databases and a 
+ real LDAP database.
+ .
+ This package contains the files required for development.
+
+Package: libtalloc0
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Hierarchical memory allocator
+ talloc is a hierarchical pool based memory allocator with destructors. It is
+ the core memory allocator used in Samba4, and has made a huge difference in
+ many aspects of Samba4 development.
+ 
+Package: libtalloc-dev
+Architecture: all
+Depends: libtalloc0 (=${Source-Version})
+Description: Hierarchical memory allocator
+ talloc is a hierarchical pool based memory allocator with destructors. It is
+ the core memory allocator used in Samba4, and has made a huge difference in
+ many aspects of Samba4 development.
+ .
+ This package contains the files required for development.
+ 
+Package: libtdb0
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Trivial Database
+ This is a simple database API. It is modelled after the structure
+ of GDBM. TDB features, unlike GDBM, multiple writers support with
+ appropriate locking.
+
+Package: libtdb-dev
+Architecture: all
+Depends: libtdb0 (=${Source-Version})
+Description: Trivial Database
+ This is a simple database API. It is modelled after the structure
+ of GDBM. TDB features, unlike GDBM, multiple writers support with
+ appropriate locking.
+ .
+ This package contains the files required for development.

Added: branches/samba4/libldb-dev.install
===================================================================
--- branches/samba4/libldb-dev.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/libldb-dev.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -0,0 +1,4 @@
+usr/include/samba-4.0/ldb.h
+usr/include/samba-4.0/ldb_errors.h
+usr/lib/pkgconfig/ldb.pc
+usr/lib/libldb.so

Added: branches/samba4/libldb0.install
===================================================================
--- branches/samba4/libldb0.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/libldb0.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -0,0 +1,22 @@
+usr/lib/libldb.so.0.*
+usr/lib/samba/ldb/asq.so
+usr/lib/samba/ldb/extended_dn.so
+usr/lib/samba/ldb/kludge_acl.so
+usr/lib/samba/ldb/objectclass.so
+usr/lib/samba/ldb/objectguid.so
+usr/lib/samba/ldb/ildap.so
+usr/lib/samba/ldb/ldap.so
+usr/lib/samba/ldb/ldaps.so
+usr/lib/samba/ldb/ldapi.so
+usr/lib/samba/ldb/operational.so
+usr/lib/samba/ldb/paged_results.so
+usr/lib/samba/ldb/password_hash.so
+usr/lib/samba/ldb/proxy.so
+usr/lib/samba/ldb/rdn_name.so
+usr/lib/samba/ldb/rootdse.so
+usr/lib/samba/ldb/samldb.so
+usr/lib/samba/ldb/schema.so
+usr/lib/samba/ldb/server_sort.so
+usr/lib/samba/ldb/skel.so
+usr/lib/samba/ldb/tdb.so
+usr/lib/samba/ldb/wins_ldb.so

Added: branches/samba4/libtalloc-dev.install
===================================================================
--- branches/samba4/libtalloc-dev.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/libtalloc-dev.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -0,0 +1,3 @@
+usr/include/samba-4.0/talloc.h
+usr/lib/pkgconfig/talloc.pc
+usr/lib/libtalloc.so

Added: branches/samba4/libtalloc0.install
===================================================================
--- branches/samba4/libtalloc0.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/libtalloc0.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -0,0 +1 @@
+usr/lib/libtalloc.so.0.*

Added: branches/samba4/libtdb-dev.install
===================================================================
--- branches/samba4/libtdb-dev.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/libtdb-dev.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -0,0 +1,3 @@
+usr/include/samba-4.0/tdb.h
+usr/lib/pkgconfig/tdb.pc
+usr/lib/libtdb.so

Added: branches/samba4/libtdb0.install
===================================================================
--- branches/samba4/libtdb0.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/libtdb0.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -0,0 +1 @@
+usr/lib/libtdb.so.0.*

Modified: branches/samba4/rules
===================================================================
--- branches/samba4/rules	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/rules	2006-03-23 00:15:53 UTC (rev 1040)
@@ -62,11 +62,9 @@
 	mkdir -p $(CURDIR)/debian/tmp/etc/samba
 	$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
-	cp $(SOURCEPATH)/setup/{provision,upgrade} $(CURDIR)/debian/tmp/usr/lib/samba/setup
 	$(MAKE) -C $(SOURCEPATH)/pidl install DESTDIR=$(CURDIR)/debian/tmp
 	install -m 755 $(CURDIR)/debian/panic-action $(CURDIR)/debian/tmp/usr/share/samba
 	install -m 755 $(CURDIR)/debian/gdbcommands $(CURDIR)/debian/tmp/etc/samba
-	patch $(CURDIR)/debian/tmp/usr/lib/samba/setup/provision.smb.conf $(CURDIR)/debian/provision.smb.conf.patch
 
 binary-arch: build install
 	dh_testdir

Modified: branches/samba4/samba-common.install
===================================================================
--- branches/samba4/samba-common.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/samba-common.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -1,5 +1,5 @@
 etc/samba/gdbcommands
 usr/bin/testparm
-usr/lib/samba/*.dat
-usr/lib/samba/js
+usr/share/samba/*.dat
+usr/share/samba/js
 usr/share/samba/panic-action

Modified: branches/samba4/samba.install
===================================================================
--- branches/samba4/samba.install	2006-03-22 21:39:37 UTC (rev 1039)
+++ branches/samba4/samba.install	2006-03-23 00:15:53 UTC (rev 1040)
@@ -2,6 +2,5 @@
 usr/bin/ntlm_auth
 usr/bin/smbstatus
 usr/bin/smbscript
-usr/lib/samba/setup
 usr/share/man/man1/ntlm_auth.1
 usr/share/man/man8/smbd.8


