diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/36-ubuntu-pae.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index 879d360f7..13887e962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ virtualbox (4.1.12-dfsg-1) UNRELEASED; urgency=low * New upstream release. + * Drop 36-ubuntu-pae.patch, applied upstream. * Make the vboxpci module buildable for a i386 kernel when running amd64. (Closes: #664730) - Update 12-make-module.patch diff --git a/debian/patches/36-ubuntu-pae.patch b/debian/patches/36-ubuntu-pae.patch deleted file mode 100644 index 732fce331..000000000 --- a/debian/patches/36-ubuntu-pae.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Enable PAE when creating Ubuntu VMs. -Author: Felix Geyer <debfx-pkg@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 4ed7bdf3b..76deb1337 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,4 +14,3 @@ 32-disable-guest-version-check.patch 33-link-static-libgsoap.patch 35-libvdeplug-soname.patch -36-ubuntu-pae.patch |