[Pkg-samba-maint] [samba] 01/02: Move samba.dckeytab module to samba package, as it relies on hdb. Closes: #736405, #736430

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch master
in repository samba.

commit 254639dd4bd2fd52a15faa49f127996470fcac34
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jan 24 23:43:37 2014 +0000

    Move samba.dckeytab module to samba package, as it relies on hdb. Closes: #736405, #736430
---
 debian/changelog | 7 +++++++
 debian/control   | 1 +
 debian/rules     | 6 +++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2047a00..e93b141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:4.1.4+dfsg-3) UNRELEASED; urgency=medium
+
+  * Move samba.dckeytab module to samba package, as it relies on hdb.
+    Closes: #736405, #736430
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Fri, 24 Jan 2014 23:35:14 +0000
+
 samba (2:4.1.4+dfsg-2) unstable; urgency=medium
 
   [ Jelmer Vernooij ]
diff --git a/debian/control b/debian/control
index c7b3c2a..74366b8 100644
--- a/debian/control
+++ b/debian/control
@@ -89,6 +89,7 @@ Suggests: bind9 (>= 1:9.5.1),
           winbind
 Enhances: bind9, ntp
 Replaces: libsamdb0 (<< 4.0.0~alpha17~),
+          python-samba (<< 2:4.1.4+dfsg-3),
           samba-ad-dc,
           samba-common (<= 2.0.5a-2),
           samba-doc (<< 2:4.0.5~),
diff --git a/debian/rules b/debian/rules
index c2f4324..e471b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,8 @@ LDB_NEXT_VERSION = $(shell python -c "x = '$(LDB_VERSION)'.split('.'); x[-1] = s
 # strict dependency on the upstream ldb version
 # this also mean samba needs a rebuild when the upstream ldb version changes
 LDB_DEPENDS = "libldb1 (<< 1:$(LDB_NEXT_VERSION)~), libldb1 (>> 1:$(LDB_VERSION)~)"
-export PYTHON=$(shell which `pyversions -d`)
+export PYSHORT=$(shell pyversions -d)
+export PYTHON=$(shell which $(PYSHORT))
 export PYTHON_CONFIG="$(PYTHON)-config"
 WAF = $(PYTHON) ./buildtools/bin/waf -v
 
@@ -132,6 +133,9 @@ override_dh_install:
 	install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp/dhclient-enter-hooks.d/samba
 	# Install other stuff not installed by "make install"
 	install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
+	mkdir -p debian/samba/usr/lib/$(PYSHORT)/dist-packages/samba
+	mv $(DESTDIR)/usr/lib/$(PYSHORT)/dist-packages/samba/dckeytab.so \
+	   debian/samba/usr/lib/$(PYSHORT)/dist-packages/samba/dckeytab.so
 	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
 
 override_dh_python2:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git