[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 322597877f51cb12679ddd628e5c6a454f7b9037
Merge: 4817daa 64964db
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Apr 30 09:55:30 2015 +0200

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

 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/changelog
index 4983441,638b8fe..53813b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,4 +1,21 @@@
 +virtualbox (5.0.0~beta2-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.26-dfsg-3) UNRELEASED; urgency=medium
+ virtualbox (4.3.26-dfsg-3) unstable; urgency=medium
  
    [ Adam Conrad ]
    * Re-work the packaging to account for the kernel modules being shipped in

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