Removed patch that's part of upstream release.

2 files changed, 0 insertions, 24 deletions

diff --git a/debian/patches/00list b/debian/patches/00list
index e54c14865..d93b7d650 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -15,4 +15,3 @@
 17-disable-help-contents.dpatch
 18-xorg-1.6.dpatch
 20-hide-help-buttons.dpatch
-21-usb-export.dpatch
diff --git a/debian/patches/21-usb-export.dpatch b/debian/patches/21-usb-export.dpatch
deleted file mode 100755
index ab3184e7f..000000000
--- a/debian/patches/21-usb-export.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21-usb-export.dpatch by Michael Meskes <meskes@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix export/USB error
-
-@DPATCH@
-
---- virtualbox-ose/src/VBox/Main/ApplianceImpl.cpp	(Revision 20513)
-+++ virtualbox-ose/src/VBox/Main/ApplianceImpl.cpp	(Revision 20514)
-@@ -4508,8 +4508,10 @@
- 
-         // this is more tricky so use the COM method
-         rc = COMGETTER(USBController)(pUsbController.asOutParam());
--        if (FAILED(rc)) throw rc;
--        rc = pUsbController->COMGETTER(Enabled)(&fUSBEnabled);
-+        if (FAILED(rc))
-+            fUSBEnabled = false;
-+        else
-+            rc = pUsbController->COMGETTER(Enabled)(&fUSBEnabled);
- 
-         pAudioAdapter = mAudioAdapter;
-         rc = pAudioAdapter->COMGETTER(Enabled)(&fAudioEnabled);