[Pkg-virtualbox-commits] [virtualbox] 01/02: 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 5376d262fe8c74627d13de3a047218e3740526a3
Merge: 16a9157 7d0a138
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Apr 15 11:14:45 2015 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog                    |  12 ++++
 debian/patches/37-diff_smap_4.patch | 108 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |   1 +
 3 files changed, 121 insertions(+)

diff --cc debian/changelog
index d95dcdf,ff66ccd..82980e7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,15 +1,30 @@@
 +virtualbox (5.0.0~beta2-dfsg-1) UNRELEASED; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * Imported upstream snapshot release.
 +  * 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.26-dfsg-2) experimental; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * remove obsolete lintian overrides.
+   * d/p/37-diff_smap_4.patch, cherry-pick upstream patch to fix a kernel
+     paging issue (LP: #1437845).
+ 
+   [ 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.26-dfsg-1) experimental; urgency=medium
  
    * Imported upstream release.

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