[Pkg-virtualbox-commits] [virtualbox] 02/02: Patch refresh, update changelog

[Gianfranco Costamagna]

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

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

commit e2c8e8d5ff83814c0a5878be2b336993982788b7
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jun 2 17:25:33 2015 +0200

    Patch refresh, update changelog
---
 debian/changelog                                |  2 +-
 debian/patches/16-no-update.patch               | 24 +++++++++++++++++-------
 debian/patches/27-hide-host-cache-warning.patch |  2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch     |  2 +-
 debian/patches/36-fix-vnc-version-string.patch  |  2 +-
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa6e864..27eacf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-virtualbox (5.0.0~beta4-dfsg-1) UNRELEASED; urgency=medium
+virtualbox (5.0.0~RC1-dfsg-1) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Imported upstream snapshot release.
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index d795776..ee1938c 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -76,14 +76,24 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
              break;
      }
 diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-index 8bf5722..5748717 100644
+index 752afd4..0438cef 100644
 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1220,7 +1220,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
-     pMenu->addSeparator();
- #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+@@ -1211,8 +1211,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+     /* 'About' action goes to Application menu: */
+     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+-    /* 'Check for Updates' action goes to Application menu: */
+-    pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+     /* 'Network Access Manager' action goes to Application menu: */
+     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+ # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+@@ -1255,8 +1253,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* 'Network Access Manager' action goes to 'File' menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+-    /* 'Check for Updates' action goes to 'File' menu: */
 -    pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
- # ifndef Q_WS_MAC
-     pMenu->addSeparator();
- # endif /* Q_WS_MAC */
+ # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+     /* 'Reset Warnings' action goes 'File' menu: */
+     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 091dfce..c53717e 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
-@@ -3974,34 +3974,12 @@
+@@ -3947,34 +3947,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 647b93c..bdabbbc 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
-@@ -5351,7 +5351,7 @@
+@@ -5349,7 +5349,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 b848227..a8e1864 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
-@@ -2564,6 +2564,7 @@
+@@ -2562,6 +2562,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