[Pkg-virtualbox-commits] [virtualbox] 01/01: Conflict with virtualbox-5.1

[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.

commit 1579e4b561bf396502b9bdadaf53d1b3d97bb80a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 6 11:43:53 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 9cdad32..3294581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ virtualbox (5.0.20-dfsg-3) UNRELEASED; urgency=medium
   [ Adam Borowski ]
   * debian/patches/fix-kernel-4.7.patch (Closes: #825819)
 
+  [ Gianfranco Costamagna ]
+  * Conflict with virtualbox-5.1
+
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 30 May 2016 12:30:24 +0200
 
 virtualbox (5.0.20-dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 9a6b8cc..3c37407 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,8 @@ Conflicts: virtualbox-2.0,
            virtualbox-4.1,
            virtualbox-4.2,
            virtualbox-4.3,
-           virtualbox-5.0
+           virtualbox-5.0,
+           virtualbox-5.1,
 Description: x86 virtualization solution - base binaries
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a

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