[Pkg-samba-maint] [samba] 01/02: Remove systemd support for now, as it is broken.

[Ivo De Decker]

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

idd-guest pushed a commit to branch samba_4.0
in repository samba.

commit e01d567ec5293953f35ac3c2c90171e48c299b70
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Tue Sep 10 21:34:06 2013 +0200

    Remove systemd support for now, as it is broken.
    
    Closes: #719477
---
 debian/changelog       |    1 +
 debian/rules           |    5 -----
 debian/samba.install   |    2 --
 debian/winbind.install |    1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 949d612..f3dc4d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ samba (2:4.0.9+dfsg-1) UNRELEASED; urgency=low
   [ Ivo De Decker ]
   * New upstream release.
   * Merge contents of samba-ad-dc into samba
+  * Remove systemd support for now, as it is broken. Closes: #719477
 
   [ Jeroen Dekkers ]
   * Drop 10_messaging_subsystem patch.
diff --git a/debian/rules b/debian/rules
index e0f9a18..1e5f27a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,11 +121,6 @@ override_dh_install:
 	   $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/plugin/krb5
 	install -m 0755 debian/setoption.py $(DESTDIR)/usr/share/samba
 	install -m 0755 debian/addshare.py $(DESTDIR)/usr/share/samba
-	# Install systemd service files.
-	mkdir -p $(DESTDIR)/lib/systemd/system
-	install -m 0755 packaging/systemd/nmb.service $(DESTDIR)/lib/systemd/system
-	install -m 0755 packaging/systemd/smb.service $(DESTDIR)/lib/systemd/system
-	install -m 0755 packaging/systemd/winbind.service $(DESTDIR)/lib/systemd/system
 	mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
 	echo "d /run/samba 0755 root root -" > $(DESTDIR)/usr/lib/tmpfiles.d/samba.conf
 	# Install samba-common's conffiles - they'll get moved later to their
diff --git a/debian/samba.install b/debian/samba.install
index 5dff795..3989d21 100644
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -1,5 +1,3 @@
-lib/systemd/system/nmb.service
-lib/systemd/system/smb.service
 usr/bin/eventlogadm
 usr/bin/oLschema2ldif
 usr/bin/pdbedit
diff --git a/debian/winbind.install b/debian/winbind.install
index 1504e0b..3637d77 100644
--- a/debian/winbind.install
+++ b/debian/winbind.install
@@ -1,4 +1,3 @@
-lib/systemd/system/winbind.service
 usr/bin/ntlm_auth
 usr/bin/wbinfo
 usr/lib/*/plugin/krb5/winbind_krb5_locator.so

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