[Pkg-samba-maint] r1809 - branches/samba/experimental/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-03-29 22:33:58 +0000 (Sat, 29 Mar 2008)
New Revision: 1809

Added:
   branches/samba/experimental/debian/libwbclient0.files
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/rules
Log:
* Handle the new libraries available in samba 3.2: ship libwbclient as a
  shared library, link against the system libtalloc (adding a
  build-dependency on libtalloc-dev - which is actually sort of kludgy
  because this only works as long as the system libtalloc has the same
  soname as the one within the samba tree, this should be fixed to
  properly build against the system libtalloc), and suppress generation
  of the tdb and netapi libraries which aren't useful to us right now.

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-03-29 12:19:52 UTC (rev 1808)
+++ branches/samba/experimental/debian/changelog	2008-03-29 22:33:58 UTC (rev 1809)
@@ -33,6 +33,13 @@
   * debian/patches/smbstatus-locking.patch: merged upstream
   * debian/patches/smbpasswd-syslog.patch: updated to account for new
     calls to logging functions
+  * Handle the new libraries available in samba 3.2: ship libwbclient as a
+    shared library, link against the system libtalloc (adding a
+    build-dependency on libtalloc-dev - which is actually sort of kludgy
+    because this only works as long as the system libtalloc has the same
+    soname as the one within the samba tree, this should be fixed to
+    properly build against the system libtalloc), and suppress generation
+    of the tdb and netapi libraries which aren't useful to us right now.
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 05 Mar 2008 22:45:28 +0100
 

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2008-03-29 12:19:52 UTC (rev 1808)
+++ branches/samba/experimental/debian/control	2008-03-29 22:33:58 UTC (rev 1809)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev, libtalloc-dev
 Build-Conflicts: libfam-dev
 Standards-Version: 3.7.3
 
@@ -35,6 +35,7 @@
   libsmbclient - Shared library that allows applications to talk to SMB/CIFS
                  servers
   libsmbclient-dev - libsmbclient shared libraries
+  libwbclient0 - Shared library for interfacing with the winbind service
   winbind - Service to resolve user and group information from Windows NT 
             servers
  .
@@ -203,3 +204,13 @@
  .
  This package contains debugging symbols for the programs included in
  the samba and smbclient packages.
+
+Package: libwbclient0
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: client library for interfacing with winbind service
+ libwbclient is an API for client interactions with the winbind service.
+ This library abstracts the winbind pipe protocol into a stable API that
+ allows the winbind server to be independently upgraded.

Added: branches/samba/experimental/debian/libwbclient0.files
===================================================================
--- branches/samba/experimental/debian/libwbclient0.files	                        (rev 0)
+++ branches/samba/experimental/debian/libwbclient0.files	2008-03-29 22:33:58 UTC (rev 1809)
@@ -0,0 +1 @@
+usr/lib/libwbclient.so.0

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2008-03-29 12:19:52 UTC (rev 1808)
+++ branches/samba/experimental/debian/rules	2008-03-29 22:33:58 UTC (rev 1809)
@@ -53,7 +53,9 @@
 		--with-ldap \
 		--with-ads \
 		--without-smbmount \
-		--with-dnsupdate
+		--with-dnsupdate \
+		--without-libtdb \
+		--without-libnetapi
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \
@@ -139,6 +141,10 @@
 	# default library path. Here we move it to /usr/lib/.
 	mv $(DESTDIR)/usr/lib/samba/libsmbclient* $(DESTDIR)/usr/lib/
 
+	# same problem with libwbclient.
+	mv $(DESTDIR)/usr/lib/samba/libwbclient.so $(DESTDIR)/usr/lib/libwbclient.so.0
+	ln -s libwbclient.so.0 $(DESTDIR)/usr/lib/samba/libwbclient.so
+
 	# Install other stuff not installed by "make install"
 	install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
 	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
@@ -225,6 +231,7 @@
 	chmod 1777 debian/samba/var/spool/samba/
 
 	DH_OPTIONS= dh_makeshlibs -plibsmbclient -V'libsmbclient (>= 3.0.2a-1)'
+	DH_OPTIONS= dh_makeshlibs -plibwbclient0
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol