[Pkg-samba-maint] r2970 - trunk/samba4/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-07-18 18:56:45 +0000 (Sat, 18 Jul 2009)
New Revision: 2970

Modified:
   trunk/samba4/debian/control
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4.install
Log:
Install ldb modules in a path that can be found by the system ldb.

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2009-07-18 18:56:40 UTC (rev 2969)
+++ trunk/samba4/debian/control	2009-07-18 18:56:45 UTC (rev 2970)
@@ -366,7 +366,7 @@
 Package: libsamba-hostconfig-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, pkg-config, libsamba-hostconfig0 (=${binary:Version}), ${misc:Depends}
+Depends: pkg-config, libsamba-hostconfig0 (=${binary:Version}), ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Samba host configuration library - development files
  The Samba software suite is a collection of programs that
@@ -404,7 +404,7 @@
 Package: libtorture-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, pkg-config, ${misc:Depends}
+Depends: pkg-config, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Library for running unit tests - development files
  The Samba software suite is a collection of programs that
@@ -443,7 +443,7 @@
 Package: libsamba-util-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, pkg-config, ${misc:Depends}
+Depends: pkg-config, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Samba utility function library - development files
  The Samba software suite is a collection of programs that

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2009-07-18 18:56:40 UTC (rev 2969)
+++ trunk/samba4/debian/rules	2009-07-18 18:56:45 UTC (rev 2970)
@@ -109,6 +109,8 @@
 	rm -f $(DESTDIR)/usr/bin/mymachinepw
 	# Already documented in debian/copyright
 	rm -f $(DESTDIR)/usr/share/samba/setup/ad-schema/licence.txt
+	# System ldb loads its modules from a different path
+	mv $(DESTDIR)/usr/lib/samba/ldb $(DESTDIR)/usr/lib/ldb
 	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
 
 get-orig-source:

Modified: trunk/samba4/debian/samba4.install
===================================================================
--- trunk/samba4/debian/samba4.install	2009-07-18 18:56:40 UTC (rev 2969)
+++ trunk/samba4/debian/samba4.install	2009-07-18 18:56:45 UTC (rev 2970)
@@ -2,5 +2,6 @@
 usr/bin/smbstatus.samba4
 usr/bin/nsstest
 usr/lib/samba
+usr/lib/ldb
 usr/share/samba/setup
 usr/share/man/man8/samba.8