[Pkg-samba-maint] [Git][samba-team/samba][master] 11 commits: Update debian/*.install and use debian/not-installed

Mathieu Parent gitlab at salsa.debian.org
Fri Mar 16 05:47:25 UTC 2018 

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


Commits:
1828bb7f by Mathieu Parent at 2018-03-15T17:48:20+01:00
Update debian/*.install and use debian/not-installed

- - - - -
9ca74c20 by Mathieu Parent at 2018-03-15T20:52:36+01:00
Use dh_missing --fail-missing

- - - - -
8ef66d03 by Mathieu Parent at 2018-03-15T21:00:34+01:00
Re-order debian/rules overrides in the order they are called

- - - - -
b863f687 by Mathieu Parent at 2018-03-15T21:01:06+01:00
debian/rules: Remove broken get-packaged-orig-source target

- - - - -
d7623e41 by Mathieu Parent at 2018-03-15T21:19:09+01:00
debian/rules: Remove unused DEB_BUILD_OPT_FOO variables

- - - - -
da0bb0a7 by Mathieu Parent at 2018-03-15T21:41:40+01:00
deian/rules: Add some comments

- - - - -
38ce540a by Mathieu Parent at 2018-03-15T22:05:33+01:00
Move dckeytab.so installation from debian/rules to debian/samba.install

- - - - -
7871193a by Mathieu Parent at 2018-03-15T22:05:34+01:00
debian/rules: Move all the custom installs from override_dh_install to override_dh_auto_install

- - - - -
d4409888 by Mathieu Parent at 2018-03-15T22:05:35+01:00
debian/rules: remove --sourcedir override to dh_install "since dh_install automatically looks for files in debian/tmp in debhelper compatibility level 7 and above"

- - - - -
9eeedf86 by Mathieu Parent at 2018-03-15T22:05:35+01:00
debian/rules: PIDFile= is now correctly set in *.service

- - - - -
b737fd4e by Mathieu Parent at 2018-03-15T22:05:36+01:00
Run wrap-and-sort

- - - - -


5 changed files:

- + debian/not-installed
- debian/rules
- debian/samba-libs.install
- debian/samba.install
- debian/samba.maintscript


Changes:

=====================================
debian/not-installed
=====================================
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,3 @@
+etc/sysconfig/samba
+usr/share/man/man7/traffic_replay.7
+usr/share/man/man7/traffic_learner.7


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,6 @@ export PYTHON=$(shell which $(PYSHORT))
 export PYTHON_CONFIG="$(PYTHON)-config"
 WAF = $(PYTHON) ./buildtools/bin/waf -v
 
-# turn DEB_BUILD_OPTIONS='foo,bar' into DEB_BUILD_OPT_FOO and DEB_BUILD_OPT_BAR
-d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-[:alnum:]]/ /g'|tr a-z A-Z)
-$(foreach o, $(d_b_o), $(eval DEB_BUILD_OPT_$o := 1))
-
 # wrapper around cups-config, to work around #726726
 export PATH:=$(CURDIR)/debian/bin:$(PATH)
 
@@ -88,18 +84,6 @@ endif
 override_dh_auto_configure:
 	$(WAF) configure $(conf_args)
 
-override_dh_auto_clean:
-	-$(WAF) clean
-	find . -name "*.pyc" | xargs rm -f
-	rm -rf buildtools/bin/.waf-*
-	rm -rf bin
-	rm -f .lock-wscript
-	rm -f ctdb/README.eventscripts
-	rm -f ctdb/README.notify.d
-
-override_dh_auto_install:
-	DESTDIR="$(DESTDIR)" $(WAF) install
-
 override_dh_auto_build:
 	DESTDIR="$(DESTDIR)" $(WAF)
 
@@ -107,29 +91,8 @@ override_dh_auto_test:
 	# Running make test requires configuration with --enable-selftest, which
 	# we don't want to do for production systems.
 
-override_dh_installsystemd:
-ifneq (,$(filter samba, $(shell dh_listpackages)))
-	dh_installsystemd -psamba
-endif
-ifneq (,$(filter winbind, $(shell dh_listpackages)))
-	dh_installsystemd -pwinbind
-endif
-ifneq (,$(filter ctdb, $(shell dh_listpackages)))
-	dh_installsystemd -pctdb --no-start --no-stop-on-upgrade
-endif
-
-override_dh_installdocs-arch:
-	cp ctdb/config/events.d/README ctdb/README.eventscripts
-	cp ctdb/config/notify.d.README ctdb/README.notify.d
-	dh_installdocs
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
-	dh_installdocs -pctdb debian/ctdb.README.hurd
-endif
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
-	dh_installdocs -pctdb debian/ctdb.README.kfreebsd
-endif
-
-override_dh_install:
+override_dh_auto_install:
+	DESTDIR="$(DESTDIR)" $(WAF) install
 	# get list of files in build log
 	find ${DESTDIR}
 	# Included in python-tevent
@@ -148,23 +111,20 @@ override_dh_install:
 	rm $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libnss_*.so
 	#Remove unused vfstest manpage vfstest is no longer installed
 	rm $(DESTDIR)/usr/share/man/man1/vfstest.1
+	# Install winbind_krb5_locator
 	mkdir -p $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/plugin/krb5
 	mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/winbind_krb5_locator.so \
 	   $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/plugin/krb5
+	# Debian goodies to set global option in smb.conf and add a share
 	install -m 0755 debian/setoption.py $(DESTDIR)/usr/share/samba
 	install -m 0755 debian/addshare.py $(DESTDIR)/usr/share/samba
-	# Install samba-common's conffiles - they'll get moved later to their
-	# correct place by dh_install
+	# Debian goodies
 	cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
 	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action
 	cp debian/gdbcommands $(DESTDIR)/etc/samba/
 	mkdir -p $(DESTDIR)/etc/dhcp/dhclient-enter-hooks.d
 	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
 	mkdir -p $(DESTDIR)/etc/ufw/applications.d
 	install -m644 debian/samba.ufw.profile $(DESTDIR)/etc/ufw/applications.d/samba
 	# use upstream version of smb.conf.5 if there is no built version
@@ -181,6 +141,7 @@ override_dh_install:
 	# Install systemd configs
 	mkdir -p $(DESTDIR)/lib/systemd/system/
 	install -m 0644 ctdb/config/ctdb.service $(DESTDIR)/lib/systemd/system/
+	# Services fixups
 	mv $(DESTDIR)/lib/systemd/system/nmb.service $(DESTDIR)/lib/systemd/system/nmbd.service
 	mv $(DESTDIR)/lib/systemd/system/smb.service $(DESTDIR)/lib/systemd/system/smbd.service
 	mv $(DESTDIR)/lib/systemd/system/samba.service $(DESTDIR)/lib/systemd/system/samba-ad-dc.service
@@ -189,26 +150,27 @@ override_dh_install:
 	  -e 's|nmb\.service|nmbd.service|' \
 	  -e 's|smb\.service|smbd.service|' \
 	  -e 's|samba\.service|samba-ad-dc.service|' \
-	  -e 's|^PIDFile=/run/|PIDFile=/var/run/samba/|' \
 	  $(DESTDIR)/lib/systemd/system/nmbd.service \
 	  $(DESTDIR)/lib/systemd/system/samba-ad-dc.service \
 	  $(DESTDIR)/lib/systemd/system/smbd.service \
 	  $(DESTDIR)/lib/systemd/system/winbind.service
 	mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
 	echo "d /run/samba 0755 root root -" > $(DESTDIR)/usr/lib/tmpfiles.d/samba.conf
-	#install -m 0644 packaging/systemd/samba.sysconfig $(DESTDIR)/etc/default/samba
-	#
-	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
+
+override_dh_installdocs-arch:
+	cp ctdb/config/events.d/README ctdb/README.eventscripts
+	cp ctdb/config/notify.d.README ctdb/README.notify.d
+	dh_installdocs
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+	dh_installdocs -pctdb debian/ctdb.README.hurd
+endif
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+	dh_installdocs -pctdb debian/ctdb.README.kfreebsd
+endif
 
 override_dh_python2:
 	dh_python2 --no-guessing-versions
 
-override_dh_installpam:
-	dh_installpam --name=samba
-
-get-packaged-orig-source:
-	./debian/build-orig.sh
-
 override_dh_installchangelogs:
 	dh_installchangelogs
 
@@ -230,24 +192,19 @@ ifneq (,$(filter ctdb, $(shell dh_listpackages)))
 	dh_installinit -pctdb --no-start --no-stop-on-upgrade --onlyscripts
 endif
 
-override_dh_shlibdeps:
-	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH dh_shlibdeps -a -Xceph.so -Xglusterfs.so -Xsnapper.so
-ifeq ($(DEB_HOST_ARCH_OS), linux)
-	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH dh_shlibdeps -a -- -pvfsmods -dRecommends -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/ceph.so -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/glusterfs.so -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
-else
-	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH dh_shlibdeps -a -- -pvfsmods -dRecommends -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
+override_dh_installsystemd:
+ifneq (,$(filter samba, $(shell dh_listpackages)))
+	dh_installsystemd -psamba
+endif
+ifneq (,$(filter winbind, $(shell dh_listpackages)))
+	dh_installsystemd -pwinbind
+endif
+ifneq (,$(filter ctdb, $(shell dh_listpackages)))
+	dh_installsystemd -pctdb --no-start --no-stop-on-upgrade
 endif
 
-override_dh_gencontrol:
-	dh_gencontrol -- -Vldb:Depends=$(LDB_DEPENDS)
-
-override_dh_makeshlibs:
-	# create symbols and shlibs files in separate wrapper script to deal with
-	# private libraries
-	debian/make_shlibs
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='samba-dbg (<< 2:4.4.5+dfsg-3~)'
+override_dh_installpam:
+	dh_installpam --name=samba
 
 override_dh_fixperms:
 	dh_fixperms
@@ -257,3 +214,34 @@ endif
 ifneq (,$(filter samba, $(shell dh_listpackages)))
 	chmod 1777 debian/samba/var/spool/samba/
 endif
+
+override_dh_missing:
+	dh_missing --fail-missing
+
+override_dh_strip:
+	dh_strip --dbgsym-migration='samba-dbg (<< 2:4.4.5+dfsg-3~)'
+
+override_dh_makeshlibs:
+	# create symbols and shlibs files in separate wrapper script to deal with
+	# private libraries
+	debian/make_shlibs
+
+override_dh_shlibdeps:
+	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH dh_shlibdeps -a -Xceph.so -Xglusterfs.so -Xsnapper.so
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH dh_shlibdeps -a -- -pvfsmods -dRecommends -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/ceph.so -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/glusterfs.so -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
+else
+	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH dh_shlibdeps -a -- -pvfsmods -dRecommends -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
+endif
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vldb:Depends=$(LDB_DEPENDS)
+
+override_dh_auto_clean:
+	-$(WAF) clean
+	find . -name "*.pyc" | xargs rm -f
+	rm -rf buildtools/bin/.waf-*
+	rm -rf bin
+	rm -f .lock-wscript
+	rm -f ctdb/README.eventscripts
+	rm -f ctdb/README.notify.d


=====================================
debian/samba-libs.install
=====================================
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -58,7 +58,7 @@ usr/lib/*/samba/libevents.so.*
 usr/lib/*/samba/libflag-mapping.so.0
 usr/lib/*/samba/libgenrand.so.0
 usr/lib/*/samba/libgensec.so.0*
-usr/lib/*/samba/libgpo.so.*
+usr/lib/*/samba/libgpext.so.0
 usr/lib/*/samba/libgse.so.*
 usr/lib/*/samba/libgssapi-samba4.so.2
 usr/lib/*/samba/libgssapi-samba4.so.2.0.0


=====================================
debian/samba.install
=====================================
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -18,10 +18,12 @@ 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
 usr/sbin/samba_dnsupdate
+usr/sbin/samba_gpoupdate
 usr/sbin/samba_spnupdate
 usr/sbin/samba_upgradedns
 usr/sbin/smbd
@@ -37,5 +39,6 @@ usr/share/man/man8/idmap_script.8
 usr/share/man/man8/nmbd.8
 usr/share/man/man8/pdbedit.8
 usr/share/man/man8/samba.8
+usr/share/man/man8/samba_gpoupdate.8
 usr/share/man/man8/smbd.8
 usr/share/samba/setup


=====================================
debian/samba.maintscript
=====================================
--- a/debian/samba.maintscript
+++ b/debian/samba.maintscript
@@ -1,5 +1,5 @@
+rm_conffile /etc/init.d/samba 2:4.6.5+dfsg-5~
 rm_conffile /etc/init/nmbd.conf 2:4.6.5+dfsg-5~
 rm_conffile /etc/init/reload-smbd.conf 2:4.6.5+dfsg-5~
 rm_conffile /etc/init/samba-ad-dc.conf 2:4.6.5+dfsg-5~
 rm_conffile /etc/init/smbd.conf 2:4.6.5+dfsg-5~
-rm_conffile /etc/init.d/samba 2:4.6.5+dfsg-5~



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/c6723aebc0b062b2c325bc34272f25f14d389c02...b737fd4e41e809707b217860de6b0ac3107d3a10

---
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/c6723aebc0b062b2c325bc34272f25f14d389c02...b737fd4e41e809707b217860de6b0ac3107d3a10
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/8ebcc716/attachment-0001.html>

More information about the Pkg-samba-maint mailing list