[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 01/01: Preventing installation of proprietary and open source virtualbox

[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 ebe96926af10bfb0db913488bc7e8dd45f785277
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sun Mar 8 12:40:38 2015 +0100

    Preventing installation of proprietary and open source virtualbox
---
 debian/changelog | 6 ++++++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 97c3638..72f6c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox-guest-additions-iso (4.3.24-2) UNRELEASED; urgency=medium
+
+   * Conflict with upstream proprietary packages 4.3 series.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sun, 08 Mar 2015 12:40:25 +0100
+
 virtualbox-guest-additions-iso (4.3.24-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 96bbc56..507bf12 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,8 @@ Conflicts: virtualbox-2.0,
            virtualbox-3.2,
            virtualbox-4.0,
            virtualbox-4.1,
-           virtualbox-4.2
+           virtualbox-4.2,
+           virtualbox-4.3
 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