[Pkg-virtualbox-commits] [virtualbox] 01/01: Drop ntp conflict

[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 3cd2bb6f5ea3782a5bc8b48496d3762c25ffe201
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Oct 10 19:35:07 2017 +0200

    Drop ntp conflict
---
 debian/changelog | 9 +++++++++
 debian/control   | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d640223..cae9181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+virtualbox (5.1.28-dfsg-3) unstable; urgency=medium
+
+  * Drop the ntp conflict, users seems to be not happy with not having it.
+    Closes: #878074.
+    People are already advised to *not* use it, and use the guest tools
+    instead.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 10 Oct 2017 19:34:19 +0200
+
 virtualbox (5.1.28-dfsg-2) unstable; urgency=high
 
   * Conflict with ntp services due to systemd hack removed.
diff --git a/debian/control b/debian/control
index 50c8d47..9cd5870 100644
--- a/debian/control
+++ b/debian/control
@@ -219,9 +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
+#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

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