[Pkg-samba-maint] [Git][samba-team/samba][master] introduce upstream-like aliases for debian .service names, add rationale

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
d1007520 by Michael Tokarev at 2023-01-28T21:59:54+03:00
introduce upstream-like aliases for debian .service names, add rationale

- - - - -


2 changed files:

- debian/rules
- debian/samba.install


Changes:

=====================================
debian/rules
=====================================
@@ -224,7 +224,7 @@ override_dh_auto_install-arch:
 	${WAF} install --destdir="${DESTDIR}"
 	# get list of files in build log
 	find debian/tmp
-	# Included in python-tevent
+	# Included in python-tevent?
 	rm debian/tmp/usr/lib/python*/*-packages/_tevent.*
 	rm debian/tmp/usr/lib/python*/*-packages/tevent.py
 	# pam stuff
@@ -237,10 +237,16 @@ override_dh_auto_install-arch:
 	install -Dp -m0644 debian/samba.ufw.profile debian/tmp/etc/ufw/applications.d/samba
 	install -Dp -m0644 debian/source_samba.py -t debian/tmp/usr/share/apport/package-hooks/
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-	# Services fixups
+# Services fixups. Historically, debian used smbd, nmbd and samba-ad-dc service names.
+# Upstream samba used names smb, nmb and samba.
+# We can not easily rename them now (need to rename possible overrides and drop-ins),
+# but we can provide synonyms
 	mv debian/tmp/lib/systemd/system/nmb.service debian/tmp/lib/systemd/system/nmbd.service
+	ln -s nmbd.service debian/tmp/lib/systemd/system/nmb.service
 	mv debian/tmp/lib/systemd/system/smb.service debian/tmp/lib/systemd/system/smbd.service
+	ln -s smbd.service debian/tmp/lib/systemd/system/smb.service
 	mv debian/tmp/lib/systemd/system/samba.service debian/tmp/lib/systemd/system/samba-ad-dc.service
+	ln -s samba-ad-dc.service debian/tmp/lib/systemd/system/samba.service
 	sed -i \
 	  -e 's|/etc/sysconfig/|/etc/default/|' \
 	  -e 's|nmb\.service|nmbd.service|' \


=====================================
debian/samba.install
=====================================
@@ -1,8 +1,8 @@
 #!/usr/bin/dh-exec --with-scripts=filter-arch,filter-build-profiles
 etc/ufw/applications.d/samba
-[linux-any] lib/systemd/system/nmbd.service
-[linux-any] lib/systemd/system/samba-ad-dc.service
-[linux-any] lib/systemd/system/smbd.service
+[linux-any] lib/systemd/system/nmb*.service
+[linux-any] lib/systemd/system/samba*.service
+[linux-any] lib/systemd/system/smb*.service
 usr/bin/dumpmscat
 usr/bin/mvxattr
 usr/bin/oLschema2ldif



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

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/d100752088f44e87e04112d3f550312904a2e0fe
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20230204/2b966ba8/attachment-0001.htm>