[Pkg-virtualbox-commits] [virtualbox] 05/05: Patch refresh

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 1ced4deaeba03964d32357810e936fb943083350
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Dec 20 22:59:03 2016 +0100

    Patch refresh
---
 debian/changelog                            | 6 ++++++
 debian/patches/16-no-update.patch           | 8 ++++----
 debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a86e9f..24a3832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (5.1.12-dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 20 Dec 2016 22:57:30 +0100
+
 virtualbox (5.1.10-dfsg-2) unstable; urgency=low
 
   [ Gianfranco Costamagna, Peter Meiser ]
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 12dd274..9c2d853 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -7,7 +7,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -468,6 +468,8 @@
+@@ -476,6 +476,8 @@
  
  void UIUpdateManager::sltForceCheck()
  {
@@ -77,7 +77,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1302,8 +1302,6 @@
+@@ -1307,8 +1307,6 @@
      /* 'About' action goes to Application menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -86,7 +86,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
      /* 'Network Access Manager' action goes to Application menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
  # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1343,7 +1341,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1348,7 +1346,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
      addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
  #  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -95,7 +95,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
  #  endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
      addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1368,9 +1366,6 @@
+@@ -1373,9 +1371,6 @@
  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      /* 'Network Access Manager' action goes to 'File' menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 3c34fd9..f2f5a25 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
-@@ -6136,7 +6136,7 @@
+@@ -6207,7 +6207,7 @@
  TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
  TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)

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