[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 01/01: Update changelog with the new conflict field

[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-guest-additions-iso.

commit 9970b90c21d1c997f60d67a5f8dc87ba2997e803
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Mar 9 10:22:57 2015 +0100

    Update changelog with the new conflict field
---
 debian/changelog | 6 ++++++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4ce273e..1c94c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox-guest-additions-iso (4.3.18-2) unstable; urgency=medium
+
+  * Conflict with upstream proprietary packages 4.3 series.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 09 Mar 2015 10:22:07 +0100
+
 virtualbox-guest-additions-iso (4.3.18-1) unstable; urgency=medium
 
   [ Felix Geyer ]
diff --git a/debian/control b/debian/control
index 1383927..02a270b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,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