[Pkg-virtualbox-commits] [virtualbox] 01/01: Update jessie branch

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch jessie
in repository virtualbox.

commit 654593629398655d82ad0ce6b023209d351fdfe7
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Mar 9 10:16:02 2015 +0100

    Update jessie branch
---
 debian/changelog | 7 +++++++
 debian/control   | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4095ab5..9ce8cf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.3.18-dfsg-3) unstable; urgency=medium
+
+   * Conflict with upstream proprietary packages 4.3 series.
+     (LP: #1371287, LP: #1375018, LP: #1385931, LP: #1386328, LP: #1421926)
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 09 Mar 2015 10:12:44 +0100
+
 virtualbox (4.3.18-dfsg-2) unstable; urgency=high
 
   [ Frank Mehnert ]
diff --git a/debian/control b/debian/control
index 8c2b869..e0fc9e1 100644
--- a/debian/control
+++ b/debian/control
@@ -97,7 +97,12 @@ Conflicts: virtualbox-2.0,
            virtualbox-2.1,
            virtualbox-2.2,
            virtualbox-3.0,
-           virtualbox-4.2
+           virtualbox-3.1,
+           virtualbox-3.2,
+           virtualbox-4.0,
+           virtualbox-4.1,
+           virtualbox-4.2,
+           virtualbox-4.3
 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