[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.14-dfsg-1

[Felix Geyer]

The following commit has been merged in the master branch:
commit d96e63fb78db30367c880db91d59adff82e3278c
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue May 1 20:22:22 2012 +0200

    Fix FTBFS with X Server 1.12.
    
    Closes: #671061

diff --git a/debian/changelog b/debian/changelog
index 8c9d7a6..c687486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ virtualbox (4.1.14-dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Drop 36-tarball-respin.patch
+  * Fix FTBFS with X Server 1.12. (Closes: #671061)
+    - Add 36-fix-ftbfs-xserver-112.patch
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 30 Apr 2012 23:54:31 +0200
 
diff --git a/debian/patches/36-fix-ftbfs-xserver-112.patch b/debian/patches/36-fix-ftbfs-xserver-112.patch
new file mode 100644
index 0000000..9c1267c
--- /dev/null
+++ b/debian/patches/36-fix-ftbfs-xserver-112.patch
@@ -0,0 +1,14 @@
+Description: Fix FTBFS with X Server 1.12.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Bug-Debian: http://bugs.debian.org/671061
+
+--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
++++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+@@ -29,6 +29,7 @@
+ #include <dlfcn.h>
+ #include <elf.h>
+ #include <unistd.h>
++#include "xorg-server.h"
+ #include "xf86.h"
+ 
+ #define VBOX_NO_MESA_PATCH_REPORTS
diff --git a/debian/patches/series b/debian/patches/series
index 32a41e5..45f7025 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 30-usb-warning-filters.patch
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
+36-fix-ftbfs-xserver-112.patch

-- 
virtualbox Debian packaging