[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 01/01: Conflict with virtualbox 5.1 too

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository virtualbox-guest-additions-iso.

commit 0d0237338241e9036d5828fd7b165a400db53e3c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 6 11:45:28 2016 +0200

    Conflict with virtualbox 5.1 too
---
 debian/changelog | 6 ++++++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 48a4aa4..7fd10f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox-guest-additions-iso (5.0.20-2) UNRELEASED; urgency=medium
+
+  * Conflict also with virtualbox-5.1 too.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 06 Jun 2016 11:45:08 +0200
+
 virtualbox-guest-additions-iso (5.0.20-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6a4c8f0..8b02310 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,8 @@ Conflicts: virtualbox-2.0,
            virtualbox-4.1,
            virtualbox-4.2,
            virtualbox-4.3,
-           virtualbox-5.0
+           virtualbox-5.0,
+           virtualbox-5.1,
 Breaks: virtualbox-guest-additions (<< 4.0.6-1~)
 Replaces: virtualbox-guest-additions (<< 4.0.6-1~)
 Description: guest additions iso image for VirtualBox

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