[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 02/02: Update changelog

[Gianfranco Costamagna]

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

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

commit 90c35619ebdadae77490efaef320171b26bd55ff
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Apr 3 10:16:13 2015 +0200

    Update changelog
---
 debian/changelog | 7 +++++++
 debian/control   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ac2ae10..2114efa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox-guest-additions-iso (5.0.0~BETA1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Conflict with upstream proprietary packages 5.0 series.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 03 Apr 2015 10:01:57 +0200
+
 virtualbox-guest-additions-iso (4.3.26-1) experimental; urgency=medium
 
    * New upstream release.
diff --git a/debian/control b/debian/control
index 507bf12..4eadc8b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ Conflicts: virtualbox-2.0,
            virtualbox-4.0,
            virtualbox-4.1,
            virtualbox-4.2,
-           virtualbox-4.3
+           virtualbox-4.3,
+           virtualbox-5.0
 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