[Pkg-virtualbox-commits] [virtualbox] 02/02: New release, update patches

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Thu Apr 2 15:37:15 UTC 2015


This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch experimental
in repository virtualbox.

commit c76c0c3c7d10ba6ab5401ede6cb5c5900ef1557f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Apr 2 17:26:41 2015 +0200

    New release, update patches
---
 debian/changelog                                |  4 +-
 debian/control                                  |  3 +-
 debian/patches/04-vboxdrv-references.patch      | 10 ++--
 debian/patches/13-module-mismatch.patch         |  6 +--
 debian/patches/16-no-update.patch               | 72 ++++++++++++-------------
 debian/patches/18-system-xorg.patch             | 14 ++---
 debian/patches/27-hide-host-cache-warning.patch | 10 ++--
 debian/patches/29-fix-ftbfs-as-needed.patch     |  6 +--
 debian/patches/36-fix-vnc-version-string.patch  | 10 ++--
 9 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88daed9..867f1e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-virtualbox (4.3.26-dfsg-2) UNRELEASED; urgency=medium
+virtualbox (5.0.0~beta1-dfsg-1) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
+  * Imported upstream snapshot release.
+  * Patch refresh.
   * remove obsolete lintian overrides.
   [ Ritesh Raj Sarraf ]
   * Remove Michael Meskes from uploaders.
diff --git a/debian/control b/debian/control
index 23f9328..d8a9591 100644
--- a/debian/control
+++ b/debian/control
@@ -104,7 +104,8 @@ Conflicts: virtualbox-2.0,
            virtualbox-4.0,
            virtualbox-4.1,
            virtualbox-4.2,
-           virtualbox-4.3
+           virtualbox-4.3,
+           virtualbox-5.0
 Description: x86 virtualization solution - base binaries
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 70f8400..a92adbc 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -3,9 +3,9 @@ Author: Daniel Hahler <ubuntu at thequod.de>
 
 Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp	2013-11-19 03:40:56.013475569 -0500
-+++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp	2013-11-19 03:40:56.013475569 -0500
-@@ -310,10 +310,8 @@
+--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:11.989792459 +0200
++++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:11.989792459 +0200
+@@ -311,10 +311,8 @@
  
  #ifdef RT_OS_LINUX
                  case VERR_SUPDRV_COMPONENT_NOT_FOUND:
@@ -18,7 +18,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
                      break;
  #endif
  
-@@ -376,10 +374,8 @@
+@@ -377,10 +375,8 @@
              {
                  case VERR_VM_DRIVER_LOAD_ERROR:
  #ifdef RT_OS_LINUX
@@ -31,7 +31,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
  #else
                      pszError = N_("VirtualBox kernel driver not loaded");
  #endif
-@@ -418,10 +414,8 @@
+@@ -419,10 +415,8 @@
                  case VERR_INVALID_HANDLE: /** @todo track down and fix this error. */
                  case VERR_VM_DRIVER_NOT_INSTALLED:
  #ifdef RT_OS_LINUX
diff --git a/debian/patches/13-module-mismatch.patch b/debian/patches/13-module-mismatch.patch
index 80fd3ba..6f46dcc 100644
--- a/debian/patches/13-module-mismatch.patch
+++ b/debian/patches/13-module-mismatch.patch
@@ -3,9 +3,9 @@ Author: Daniel Baumann <daniel at debian.org>
 
 Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp	2013-11-19 03:41:10.333476234 -0500
-+++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp	2013-11-19 03:41:10.333476234 -0500
-@@ -425,9 +425,11 @@
+--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:20.225796295 +0200
++++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:20.221796293 +0200
+@@ -426,9 +426,11 @@
                      break;
                  case VERR_VERSION_MISMATCH:
                  case VERR_VM_DRIVER_VERSION_MISMATCH:
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 35411d0..e27d9b8 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -5,9 +5,9 @@ Author: Daniel Hahler <ubuntu at thequod.de>, Felix Geyer <fgeyer at debian.org>
 diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2013-11-19 03:42:12.725479132 -0500
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2013-11-19 03:42:12.721479132 -0500
-@@ -440,6 +440,8 @@
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2015-04-02 15:44:20.879669066 +0200
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2015-04-02 15:44:20.879669066 +0200
+@@ -428,6 +428,8 @@
  
  void UIUpdateManager::sltForceCheck()
  {
@@ -18,58 +18,52 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
  }
 Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	2013-11-19 03:42:12.725479132 -0500
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	2013-11-19 03:42:12.721479132 -0500
-@@ -658,7 +658,6 @@
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	2015-04-02 15:44:20.879669066 +0200
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	2015-04-02 15:44:20.879669066 +0200
+@@ -928,7 +928,6 @@
      m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
 -    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifndef RT_OS_DARWIN
      m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
- }
+@@ -961,8 +960,6 @@
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     connect(action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()),
+             gNetworkManager, SLOT(show()), Qt::UniqueConnection);
+-    connect(action(UIActionIndex_Simple_CheckForUpdates), SIGNAL(triggered()),
+-            gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifdef RT_OS_DARWIN
+     connect(action(UIActionIndex_M_Application_S_About), SIGNAL(triggered()),
+@@ -1129,9 +1126,6 @@
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* 'Network Manager' action: */
+     fSeparator = addAction(pMenu, action(UIActionIndex_Simple_NetworkAccessManager));
+-    /* 'Check for Updates' action (only for Selector pool): */
+-    if (type() == UIActionPoolType_Selector)
+-        fSeparator = addAction(pMenu, action(UIActionIndex_Simple_CheckForUpdates));
+ 
+     /* Separator? */
+     if (fSeparator)
 Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 ===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	2013-11-19 03:42:12.725479132 -0500
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	2013-11-19 03:42:12.721479132 -0500
-@@ -59,7 +59,6 @@
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	2015-04-02 15:44:20.879669066 +0200
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	2015-04-02 15:44:20.879669066 +0200
+@@ -70,7 +70,6 @@
      UIActionIndex_Simple_ResetWarnings,
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      UIActionIndex_Simple_NetworkAccessManager,
 -    UIActionIndex_Simple_CheckForUpdates,
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifndef RT_OS_DARWIN
      UIActionIndex_Simple_About,
- 
-Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	2013-11-19 03:42:12.725479132 -0500
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	2013-11-19 04:34:19.701624365 -0500
-@@ -1331,12 +1331,6 @@
-     pMenu->addSeparator();
-     m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
-     pMenu->addAction(m_pNetworkAccessManager);
--    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
--    CVirtualBox vbox = vboxGlobal().virtualBox();
--    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
--        pMenu->addAction(m_pUpdateAction);
--    else
--        m_pUpdateAction->setEnabled(false);
- #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- #ifndef Q_WS_MAC
-     pMenu->addSeparator();
-@@ -1473,7 +1467,6 @@
-     connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
- #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-     connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
--    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
- #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-     connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
- 
 Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2013-11-19 03:42:12.725479132 -0500
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2013-11-19 03:42:12.725479132 -0500
-@@ -545,6 +545,10 @@
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2015-04-02 15:44:20.879669066 +0200
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2015-04-02 15:44:20.879669066 +0200
+@@ -295,6 +295,10 @@
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index a94cd87..038acc8 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -3,11 +3,11 @@ Author: Michael Meskes <meskes at debian.org>, Felix Geyer <fgeyer at debian.org>
 
 Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
 ===================================================================
---- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-11-19 04:35:17.181627034 -0500
-+++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-11-19 04:36:33.913630598 -0500
+--- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2015-04-02 15:44:24.955670965 +0200
++++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2015-04-02 15:44:24.955670965 +0200
 @@ -40,8 +40,6 @@
  	VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
+ ifndef VBOX_ONLY_VALIDATIONKIT
   if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
 -  LIBRARIES += \
 -  	VBoxGuestR3LibXFree86
@@ -16,9 +16,9 @@ Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
    LIBRARIES += \
 Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
 ===================================================================
---- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-11-19 04:35:17.181627034 -0500
-+++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-11-19 04:35:17.181627034 -0500
-@@ -74,18 +74,12 @@
+--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2015-04-02 15:44:24.955670965 +0200
++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2015-04-02 15:44:24.955670965 +0200
+@@ -67,18 +67,12 @@
  VBoxOGL_INCS           = .
  if1of ($(KBUILD_TARGET), linux solaris freebsd)
   VBoxOGL_INCS     += \
@@ -42,7 +42,7 @@ Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
   VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
  endif
  
-@@ -215,10 +209,10 @@
+@@ -208,10 +202,10 @@
  	$(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
  if1of ($(KBUILD_TARGET), linux solaris freebsd)
   VBoxOGL_LIBS += \
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 747a43e..bcbeec6 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -4,13 +4,13 @@ Author: Felix Geyer <fgeyer at debian.org>
 
 Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp	2013-12-03 07:11:18.165655881 -0500
-+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp	2013-12-03 07:12:44.373659885 -0500
-@@ -3686,34 +3686,12 @@
+--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.415740583 +0200
++++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.411740580 +0200
+@@ -3893,34 +3893,12 @@
                      if (   enmFsTypeFile == RTFSTYPE_EXT4
                          || enmFsTypeFile == RTFSTYPE_XFS)
                      {
--                        setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
+-                        i_setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
 -                                N_("The host I/O cache for at least one controller is disabled "
 -                                   "and the medium '%ls' for this VM "
 -                                   "is located on an %s partition. There is a known Linux "
@@ -27,7 +27,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
                                  || enmFsTypeSnap == RTFSTYPE_XFS)
                               && !mfSnapshotFolderExt4WarningShown)
                      {
--                        setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
+-                        i_setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
 -                                N_("The host I/O cache for at least one controller is disabled "
 -                                   "and the snapshot folder for this VM "
 -                                   "is located on an %s partition. There is a known Linux "
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index ba48ab3..8ad9adb 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -3,9 +3,9 @@ Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emul
 
 Index: virtualbox/Config.kmk
 ===================================================================
---- virtualbox.orig/Config.kmk	2013-11-19 04:39:48.053639615 -0500
-+++ virtualbox/Config.kmk	2013-11-19 04:39:48.049639615 -0500
-@@ -5039,7 +5039,7 @@
+--- virtualbox.orig/Config.kmk	2015-04-02 15:46:59.611743003 +0200
++++ virtualbox/Config.kmk	2015-04-02 15:46:59.611743003 +0200
+@@ -5272,7 +5272,7 @@
  TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
  TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 9060c6d..81c574a 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -1,8 +1,8 @@
 Index: virtualbox/Config.kmk
 ===================================================================
---- virtualbox.orig/Config.kmk	2013-11-19 04:41:16.173643708 -0500
-+++ virtualbox/Config.kmk	2013-11-19 04:41:16.169643708 -0500
-@@ -2501,6 +2501,7 @@
+--- virtualbox.orig/Config.kmk	2015-04-02 15:47:04.439745251 +0200
++++ virtualbox/Config.kmk	2015-04-02 15:47:04.435745250 +0200
+@@ -2560,6 +2560,7 @@
  	-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
  	-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
  	-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
@@ -12,8 +12,8 @@ Index: virtualbox/Config.kmk
  	-e 's/@VBOX_VENDOR_SHORT@/$(VBOX_VENDOR_SHORT)/g' \
 Index: virtualbox/src/VBox/ExtPacks/VNC/ExtPack.xml
 ===================================================================
---- virtualbox.orig/src/VBox/ExtPacks/VNC/ExtPack.xml	2013-11-19 04:41:16.173643708 -0500
-+++ virtualbox/src/VBox/ExtPacks/VNC/ExtPack.xml	2013-11-19 04:41:16.169643708 -0500
+--- virtualbox.orig/src/VBox/ExtPacks/VNC/ExtPack.xml	2015-04-02 15:47:04.439745251 +0200
++++ virtualbox/src/VBox/ExtPacks/VNC/ExtPack.xml	2015-04-02 15:47:04.435745250 +0200
 @@ -2,7 +2,7 @@
  <VirtualBoxExtensionPack xmlns="http://www.virtualbox.org/VirtualBoxExtensionPack" version="1.0">
      <Name>VNC</Name>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git



More information about the Pkg-virtualbox-commits mailing list