[Pkg-virtualbox-commits] [virtualbox] 01/03: Upload to unstable, adding the new virtualbox-guest-utils systemd service file, conflicting with systemd timesyncd

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 69caa15a8fc6687e259f60e981538b2395d0c1df
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Oct 4 16:56:07 2017 +0200

    Upload to unstable, adding the new virtualbox-guest-utils systemd service file, conflicting with systemd timesyncd
---
 debian/changelog                      |  8 ++++++++
 debian/control                        |  3 +++
 debian/virtualbox-guest-utils.service | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 333902e..25d7db4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (5.1.28-dfsg-2) unstable; urgency=high
+
+  * Conflict with ntp services due to systemd hack removed.
+    (Closes: #873263)
+    (thanks to the various systemd maintainers and upstream for the help)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 04 Oct 2017 16:47:29 +0200
+
 virtualbox (5.1.28-dfsg-1) unstable; urgency=medium
 
   * Remove double "in" keyword, to make lintian happy
diff --git a/debian/control b/debian/control
index eb1d486..5578db8 100644
--- a/debian/control
+++ b/debian/control
@@ -219,6 +219,9 @@ Description: x86 virtualization solution - X11 guest utilities
 Package: virtualbox-guest-utils
 Architecture: amd64 i386
 Depends: adduser, pciutils, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: time-daemon, ntp
+Provides: time-daemon
+Replaces: time-daemon
 Recommends: virtualbox-guest-dkms (= ${source:Version}) | virtualbox-guest-source (= ${source:Version}) | virtualbox-guest-modules
 Suggests: virtualbox-guest-x11 (= ${binary:Version})
 Description: x86 virtualization solution - non-X11 guest utilities
diff --git a/debian/virtualbox-guest-utils.service b/debian/virtualbox-guest-utils.service
new file mode 100644
index 0000000..5426a2f
--- /dev/null
+++ b/debian/virtualbox-guest-utils.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Virtualbox guest utils
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=forking
+Restart=no
+TimeoutSec=5min
+IgnoreSIGPIPE=no
+KillMode=process
+GuessMainPID=no
+RemainAfterExit=yes
+ExecStart=/etc/init.d/virtualbox-guest-utils start
+ExecStop=/etc/init.d/virtualbox-guest-utils stop
+
+[Install]
+WantedBy=multi-user.target
+

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