[Pkg-virtualbox-commits] [virtualbox] 01/01: Merge branch 'jessie'

[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 02e73bc7db7a56f99c06bd6630038fc54e991bbe
Merge: 2600dd7 faeb9b3
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Mar 13 08:50:23 2015 +0100

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 19 ++++++++++++++++++-
 debian/rules     |  7 ++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 3e5d615,bbdde7a..7f05cc4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,51 -1,20 +1,68 @@@
- virtualbox (4.3.24-dfsg-2) UNRELEASED; urgency=medium
++virtualbox (4.3.24-dfsg-2) experimental; 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>  Sun, 08 Mar 2015 12:09:26 +0100
 +
 +virtualbox (4.3.24-dfsg-1) experimental; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * Imported upstream release (Closes: #779025).
 +  * Remove d/p/38-remove-hardcoded-gcc.patch, use --with-gcc and
 +    --with-g++ configure flags.
 +  * Remove d/p/37-fix-build.patch, merged upstream.
 +
 +  [ Ritesh Raj Sarraf ]
 +  * [3bf4cdd] Add back versioned dependency on gcc multilib
 +
 + -- Ritesh Raj Sarraf <rrs at debian.org>  Wed, 04 Mar 2015 17:35:40 +0530
 +
 +virtualbox (4.3.22-dfsg-1) experimental; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * Imported Upstream release.
 +  * Update copyright year.
 +  * d/p/37-fix-build.patch fix build, following upstream change in
 +    xorg driver build (thanks to Michael Thayer for the hint and
 +    the help).
 +  * Remove old patches.
 +  * d/p/38-remove-hardcoded-gcc.patch use CC and CXX from d/rules
 +    until virtualbox is gcc-5 ready.
 +
 +  [ Ritesh Raj Sarraf ]
 +  * [1413631] Build with gcc 4 only
 +  * [f34c886] Add versioned dependency on g++-multilib
 +
 + -- Ritesh Raj Sarraf <rrs at debian.org>  Sun, 15 Feb 2015 16:56:09 +0530
 +
 +virtualbox (4.3.20-dfsg-1) experimental; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * Imported Upstream release.
 +
 +  [ Ritesh Raj Sarraf ]
 +  * Flip build dependency to libcurl4-gnutls-dev
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 03 Dec 2014 09:37:08 +0100
 +
+ 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 ]
+   * d/rules: Disable experimental code by exporting
+     VBOX_WITH_VMSVGA= VBOX_WITH_VMSVGA3D=
+     this fixes CVE-2014-6595, CVE-2014-6590, CVE-2014-6589,
+     CVE-2014-6588 and CVE-2015-0427. (Closes: #775888)
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 22 Jan 2015 10:51:40 +0100
+ 
  virtualbox (4.3.18-dfsg-1) unstable; urgency=medium
  
    [ Gianfranco Costamagna ]

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