[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.8-dfsg-2-10-g5be51b6

[Felix Geyer]

The following commit has been merged in the master branch:
commit 31774d782924d60e0ee0136e73708cebb931959e
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Wed Mar 14 13:17:19 2012 +0100

    Refresh 18-system-xorg.patch.

diff --git a/debian/changelog b/debian/changelog
index 69958b2..e8635bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 virtualbox (4.1.10-dfsg-1) UNRELEASED; urgency=low
 
   * Build-depend on libpng-dev instead of libpng12-dev. (Closes: #662537)
+  * Refresh 18-system-xorg.patch.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 05 Mar 2012 14:54:53 +0100
 
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index 64dc235..4b330b2 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -212,8 +212,16 @@ diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/
  vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_111_DEFS := $(vboxvideo_drv_15_DEFS)
+@@ -347,7 +336,6 @@ vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ #
+ # vboxvideo_drv_112
+ #
+-DLLS += vboxvideo_drv_112
+ vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_drv_15_DEFS)
 @@ -317,6 +306,23 @@ vboxvideo_drv_111_INCS = \
- vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_15_SOURCES)
  
  
 +vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv

-- 
virtualbox Debian packaging