[Pkg-samba-maint] [Git][samba-team/samba][master] Revert "Move dckeytab.so installation from debian/rules to debian/samba.install"

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
43e1894a by Mathieu Parent at 2018-03-16T11:33:59+01:00
Revert "Move dckeytab.so installation from debian/rules to debian/samba.install"

This reverts commit 38ce540aa12210c475db239d51e3a39bda4234d3.

And fixes:
W: samba source: binaries-have-file-conflict python-samba samba usr/lib/python2.7/dist-packages/samba/dckeytab.x86_64-linux-gnu.so
W: samba source: binaries-have-file-conflict python-samba-dbgsym samba-dbgsym usr/lib/debug/.build-id/33/db5dfe88e544fc39b2a791ee53f1df5f157dbe.debug
W: samba source: intra-source-package-circular-dependency python-samba samba samba-common-bin

- - - - -


2 changed files:

- debian/rules
- debian/samba.install


Changes:

=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -143,6 +143,10 @@ override_dh_auto_install:
 	install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
 	mkdir -p $(DESTDIR)/etc/ufw/applications.d
 	install -m644 debian/samba.ufw.profile $(DESTDIR)/etc/ufw/applications.d/samba
+	# Install other stuff not installed by "make install"
+	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
 	# use upstream version of smb.conf.5 if there is no built version
 	# this is a temporary workaround for #750593 in xsltproc
 	[ -e $(DESTDIR)/usr/share/man/man5/smb.conf.5 ] || \


=====================================
debian/samba.install
=====================================
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -18,7 +18,6 @@ usr/lib/*/samba/libkdc-samba4.so.2
 usr/lib/*/samba/libkdc-samba4.so.2.0.0
 usr/lib/*/samba/libpac.so.*
 usr/lib/*/samba/service/*.so
-usr/lib/python*/dist-packages/samba/dckeytab.so
 usr/sbin/mksmbpasswd
 usr/sbin/nmbd
 usr/sbin/samba



View it on GitLab: https://salsa.debian.org/samba-team/samba/commit/43e1894a377332646efbed5f9fe5fe9dfc1bf7b2

---
View it on GitLab: https://salsa.debian.org/samba-team/samba/commit/43e1894a377332646efbed5f9fe5fe9dfc1bf7b2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20180316/6dc00c5e/attachment.html>