[Pkg-virtualbox-commits] [virtualbox] 03/03: New upstream beta, patch refresh

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Fri May 8 07:25:51 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 b3812684c7044e29b5702753a30a9e562d5335a6
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri May 8 09:24:36 2015 +0200

    New upstream beta, patch refresh
---
 debian/changelog                                    |  2 +-
 debian/patches/01-build-arch.patch                  |  2 +-
 debian/patches/16-no-update.patch                   | 13 ++++++-------
 debian/patches/23-remove-invalid-chars-check.patch  |  2 +-
 debian/patches/27-hide-host-cache-warning.patch     |  2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch         |  2 +-
 debian/patches/32-disable-guest-version-check.patch |  2 +-
 debian/patches/36-fix-vnc-version-string.patch      |  2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53813b0..4511239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-virtualbox (5.0.0~beta2-dfsg-1) UNRELEASED; urgency=medium
+virtualbox (5.0.0~beta3-dfsg-1) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Imported upstream snapshot release.
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index 68e7e27..bd8908f 100644
--- a/debian/patches/01-build-arch.patch
+++ b/debian/patches/01-build-arch.patch
@@ -5,7 +5,7 @@ Index: virtualbox/configure
 ===================================================================
 --- virtualbox.orig/configure	2013-11-19 03:40:50.133475296 -0500
 +++ virtualbox/configure	2013-11-19 03:40:50.129475296 -0500
-@@ -336,7 +336,7 @@
+@@ -337,7 +337,7 @@
  check_environment()
  {
    test_header environment
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 5948ca0..d795776 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -21,7 +21,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
-@@ -904,7 +904,6 @@ void UIActionPool::preparePool()
+@@ -991,7 +991,6 @@ void UIActionPool::preparePool()
      m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
@@ -29,7 +29,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
      m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
-@@ -947,8 +946,6 @@ void UIActionPool::prepareConnections()
+@@ -1034,8 +1033,6 @@ void UIActionPool::prepareConnections()
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
              gNetworkManager, SLOT(show()), Qt::UniqueConnection);
@@ -38,7 +38,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
              &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
-@@ -1023,7 +1020,7 @@ void UIActionPool::updateConfiguration()
+@@ -1110,7 +1107,7 @@ void UIActionPool::updateConfiguration()
      if (!fUpdateAllowed)
      {
          m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType)
@@ -52,7 +52,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
-@@ -59,7 +59,6 @@ enum UIActionIndex
+@@ -62,7 +62,6 @@ enum UIActionIndex
      UIActionIndex_M_Application_S_Preferences,
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      UIActionIndex_M_Application_S_NetworkAccessManager,
@@ -64,7 +64,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
 ===================================================================
 --- 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 @@
+@@ -310,6 +310,10 @@
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
@@ -75,12 +75,11 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
          default:
              break;
      }
-             &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
 diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 index 8bf5722..5748717 100644
 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1155,7 +1155,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1220,7 +1220,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
      pMenu->addSeparator();
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index 7447036..63e55bb 100644
--- a/debian/patches/23-remove-invalid-chars-check.patch
+++ b/debian/patches/23-remove-invalid-chars-check.patch
@@ -6,7 +6,7 @@ Index: virtualbox/configure
 ===================================================================
 --- virtualbox.orig/configure	2013-11-19 04:36:42.817631012 -0500
 +++ virtualbox/configure	2013-11-19 04:36:42.813631012 -0500
-@@ -168,11 +168,6 @@
+@@ -169,11 +169,6 @@
  # the restricting tool is ar (mri mode).
  INVALID_CHARS="[^A-Za-z0-9/\\$:._-]"
  
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 829c632..091dfce 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
 ===================================================================
 --- 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
-@@ -3899,34 +3899,12 @@
+@@ -3974,34 +3974,12 @@
                      if (   enmFsTypeFile == RTFSTYPE_EXT4
                          || enmFsTypeFile == RTFSTYPE_XFS)
                      {
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 8ad9adb..9d97aad 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -5,7 +5,7 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- 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 @@
+@@ -5268,7 +5268,7 @@
  TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
  TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/32-disable-guest-version-check.patch b/debian/patches/32-disable-guest-version-check.patch
index 844aa06..8f76df6 100644
--- a/debian/patches/32-disable-guest-version-check.patch
+++ b/debian/patches/32-disable-guest-version-check.patch
@@ -3,7 +3,7 @@ Author: Felix Geyer <fgeyer at debian.org>
 
 --- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
 +++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
-@@ -39,6 +39,7 @@ public:
+@@ -40,6 +40,7 @@ public:
  
  static int showNotify(const char *pcHeader, const char *pcBody)
  {
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 81c574a..64d786e 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -2,7 +2,7 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- 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 @@
+@@ -2556,6 +2556,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' \

-- 
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