[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 5fcbae4fb98cae0f563beaf5fa268cd10c1e2b6e
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Mar 16 19:42:28 2012 +0100

    Enable PAE when creating Ubuntu VMs as it's required by the i386 kernel.

diff --git a/debian/changelog b/debian/changelog
index d519980..9ca6ee2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ virtualbox (4.1.10-dfsg-1) UNRELEASED; urgency=low
   * Refresh 18-system-xorg.patch.
   * Link against libgsoapssl++ instead of libgsoap++.
     - Update 33-link-static-libgsoap.patch
+  * Enable PAE when creating Ubuntu VMs as it's required by the i386 kernel.
+    - Add 36-ubuntu-pae.patch
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 05 Mar 2012 14:54:53 +0100
 
diff --git a/debian/patches/36-ubuntu-pae.patch b/debian/patches/36-ubuntu-pae.patch
new file mode 100644
index 0000000..732fce3
--- /dev/null
+++ b/debian/patches/36-ubuntu-pae.patch
@@ -0,0 +1,16 @@
+Description: Enable PAE when creating Ubuntu VMs.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Bug: https://www.virtualbox.org/ticket/10236
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/907390
+
+--- a/src/VBox/Main/src-all/Global.cpp
++++ b/src/VBox/Main/src-all/Global.cpp
+@@ -196,7 +196,7 @@ const Global::OSType Global::sOSTypes[SchemaDefs::OSTypeId_COUNT] =
+        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Ubuntu,          "Ubuntu",
+-      VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++      VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Ubuntu_64,       "Ubuntu (64 bit)",
diff --git a/debian/patches/series b/debian/patches/series
index 76deb13..4ed7bdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 32-disable-guest-version-check.patch
 33-link-static-libgsoap.patch
 35-libvdeplug-soname.patch
+36-ubuntu-pae.patch

-- 
virtualbox Debian packaging