[Pkg-virtualbox-commits] [virtualbox] 01/01: Merge branch 'master' into experimental

[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.

commit be540aaed1fbfc559941ee250f33d3a996aca5b4
Merge: aa3b4ba 9c523d8
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu May 28 09:01:11 2015 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/27-hide-host-cache-warning.patch
    	debian/patches/29-fix-ftbfs-as-needed.patch
    	debian/patches/36-fix-vnc-version-string.patch

 debian/changelog                           | 10 +++++++---
 debian/gbp.conf                            |  4 ++++
 debian/virtualbox-guest-source.files/rules |  3 ++-
 debian/virtualbox-source.files/rules       |  3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 69e1fcb,8428a44..b5742f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,14 +1,29 @@@
 +virtualbox (5.0.0~beta4-dfsg-1) UNRELEASED; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * Imported upstream snapshot release.
 +    - virtualbox 5.0 builds fine with gcc 5.1, removing the
 +      gcc-4.9 workaround (d/{rules,control})
 +  * Patch refresh.
 +  * remove obsolete lintian overrides.
 +  * Add VBoxDTrace not linked against libc lintian override.
 +    It seems to really not use libc symbols.
 +  * d/rules: remove VBoxDTraceR0.debug and strip VBoxDTraceR0.r0
 +    files.
-   [ Ritesh Raj Sarraf ]
-   * Remove Michael Meskes from uploaders.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 20 Mar 2015 12:02:04 +0100
 +
  virtualbox (4.3.28-dfsg-1) unstable; urgency=medium
  
-   * New upstream release.
+   * New upstream release (Closes: #785655).
+     - fix for CVE-2015-3456 a.k.a. VENOM (Closes: #785424)
      - patch refresh.
      - remove d/p/37-diff_smap_4.patch.
+   * Remove MAKE=kmk on virtualbox{,-guest}-source.files/rules
+     (Closes: #785161).
+     Upstream doesn't recommend using kmk to build kernel modules.
+     this reverts 63fa6b7b86035b53e8d053b894814eccac9ce595
+   * Add gbp.conf file.
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 14 May 2015 09:36:52 +0200
  

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