[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 a9da66514373e4e2b8af3c8568975cab67781037
Merge: 87f6281 28524c4
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Apr 22 16:24:54 2015 +0200

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

 debian/changelog | 12 ++++++++++++
 debian/control   |  4 +++-
 debian/rules     |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 82980e7,59b3627..da32fc7
--- 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-3) UNRELEASED; urgency=medium
+ 
+   [ Adam Conrad ]
+   * Re-work the packaging to account for the kernel modules being shipped in
+     the master kernel packages, removing the need for dkms (LP: #1434579):
+     - Make the dkms package provide a virtual package matching what the
+       kernel packages provide to indicate that they ship the dkms modules.
+     - Add an alternate dep from the utils package to the virtual driver.
+     - Make the x11 driver package associate with the VGA controller PCI ID.
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 22 Apr 2015 16:16:23 +0200
+ 
  virtualbox (4.3.26-dfsg-2) experimental; urgency=medium
  
    [ Gianfranco Costamagna ]

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