[Pkg-virtualbox-commits] [virtualbox] 01/01: Fixup previous upload for kernel 4.14

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 06ebaadae5af6af9c5be3ba9b72cccc622fa0ca1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Nov 7 10:54:48 2017 +0100

    Fixup previous upload for kernel  4.14
---
 debian/changelog           |  6 ++++++
 debian/patches/69524.patch | 13 +++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1a64747..db4583a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (5.2.0-dfsg-4) unstable; urgency=medium
+
+  * 69524.patch: fixup the kernel 4.14 fix 
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 07 Nov 2017 10:53:52 +0100
+
 virtualbox (5.2.0-dfsg-3) unstable; urgency=medium
 
   * Switch to lynx (Closes: #880935)
diff --git a/debian/patches/69524.patch b/debian/patches/69524.patch
new file mode 100644
index 0000000..31759e5
--- /dev/null
+++ b/debian/patches/69524.patch
@@ -0,0 +1,13 @@
+Index: virtualbox/src/VBox/Additions/linux/drm/vbox_drv.c
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ virtualbox/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -309,7 +309,7 @@
+ 
+ static int __init vbox_init(void)
+ {
+-#ifdef CONFIG_VGA_CONSOLE || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++#if defined(CONFIG_VGA_CONSOLE) || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+ 	if (vgacon_text_force() && vbox_modeset == -1)
+ 		return -EINVAL;
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index ed69b0f..2b3136c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@
 69143.patch
 fix-build.patch
 try-to-build-vboxvideo.patch
+69524.patch

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