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

[Felix Geyer]

The following commit has been merged in the master branch:
commit 681832ffdcadc600171707048a908cd2210b7ebe
Author: Felix Geyer <fgeyer at debian.org>
Date:   Tue Jul 16 21:36:21 2013 +0200

    16-no-update.patch: drop changes to UISettingsDialogSpecific.cpp
    
    Patch by Gianfranco Costamagna

diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 7b32640..3525c27 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -14,19 +14,6 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* Force call for new version check: */
      sltCheckIfUpdateIsNecessary(true /* force call */);
  }
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvail
- #endif /* !VBOX_WITH_NETFLT */
-             break;
-         }
-+        case GLSettingsPage_Update:
-+        {
-+            return false;
-+        }
-         default:
-             break;
-     }
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 @@ -538,7 +538,6 @@ void UIActionPool::createActions()

-- 
virtualbox Debian packaging