[Pkg-virtualbox-commits] [virtualbox] 03/14: New upstream release, patch refresh
Ritesh Raj Sarraf
rrs at moszumanska.debian.org
Wed Jun 4 14:25:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
rrs pushed a commit to branch master
in repository virtualbox.
commit 3ba7cd851761d7df698a8093e4289c9b968855cd
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Mar 10 10:52:58 2014 +0100
New upstream release, patch refresh
---
debian/changelog | 7 +++++++
debian/patches/16-no-update.patch | 10 +++++-----
debian/patches/18-system-xorg.patch | 6 +++---
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 +-
6 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2a21687..e720581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.3.8-dfsg-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release, patch refresh.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Mon, 10 Mar 2014 10:35:35 +0100
+
virtualbox (4.3.6-dfsg-2) unstable; urgency=medium
* Disable bindnow in hardening-wrapper. This fixes loading the x11 driver.
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 78f7055..1e9b74e 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -20,7 +20,7 @@ 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
-@@ -650,7 +650,6 @@
+@@ -653,7 +653,6 @@
m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
@@ -32,7 +32,7 @@ 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
-@@ -58,7 +58,6 @@
+@@ -59,7 +59,6 @@
UIActionIndex_Simple_ResetWarnings,
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
UIActionIndex_Simple_NetworkAccessManager,
@@ -44,7 +44,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
===================================================================
--- 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
-@@ -1324,12 +1324,6 @@
+@@ -1331,12 +1331,6 @@
pMenu->addSeparator();
m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
pMenu->addAction(m_pNetworkAccessManager);
@@ -57,7 +57,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
#ifndef Q_WS_MAC
pMenu->addSeparator();
-@@ -1462,7 +1456,6 @@
+@@ -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()));
@@ -69,7 +69,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
===================================================================
--- 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
-@@ -533,6 +533,10 @@
+@@ -545,6 +545,10 @@
#endif /* !VBOX_WITH_NETFLT */
break;
}
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index c6ffd92..8758d8b 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -10,7 +10,7 @@ Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
ifndef VBOX_ONLY_TESTSUITE
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
- LIBRARIES += \
-- VBoxGuestR3LibXFree86
+- VBoxGuestR3LibXFree86
endif
endif
LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
@@ -18,7 +18,7 @@ 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
-@@ -82,18 +82,12 @@
+@@ -74,18 +74,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
-@@ -223,10 +217,10 @@
+@@ -215,10 +209,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 4cdbefa..c8caef3 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 2013-12-03 07:11:18.165655881 -0500
+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp 2013-12-03 07:12:44.373659885 -0500
-@@ -3589,34 +3589,12 @@
+@@ -3677,34 +3677,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 057b401..2e55312 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 2013-11-19 04:39:48.053639615 -0500
+++ virtualbox/Config.kmk 2013-11-19 04:39:48.049639615 -0500
-@@ -4826,7 +4826,7 @@
+@@ -4835,7 +4835,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 ccd9c17..5c1c000 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 2013-11-19 04:41:16.173643708 -0500
+++ virtualbox/Config.kmk 2013-11-19 04:41:16.169643708 -0500
-@@ -2457,6 +2457,7 @@
+@@ -2463,6 +2463,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