[Pkg-virtualbox-commits] [virtualbox] 12/14: New upstream release, patch refresh

[Ritesh Raj Sarraf]

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

rrs pushed a commit to branch master
in repository virtualbox.

commit a2a26c0baa06614f321be532763a80e11c1b34fd
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 27 15:08:24 2014 +0200

    New upstream release, patch refresh
---
 debian/changelog                                | 6 ++++++
 debian/patches/16-no-update.patch               | 2 +-
 debian/patches/27-hide-host-cache-warning.patch | 2 +-
 debian/patches/28-no-selinux-fedora.patch       | 2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch     | 2 +-
 debian/patches/36-fix-vnc-version-string.patch  | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19358cd..525e11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (4.3.12-dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 27 May 2014 15:08:04 +0200
+
 virtualbox (4.3.10-dfsg-1) unstable; urgency=high
 
   * New upstream release.
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 1e9b74e..31f6f28 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	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
-@@ -475,6 +475,8 @@
+@@ -440,6 +440,8 @@
  
  void UIUpdateManager::sltForceCheck()
  {
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index c8caef3..056c0b8 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
-@@ -3677,34 +3677,12 @@
+@@ -3681,34 +3681,12 @@
                      if (   enmFsTypeFile == RTFSTYPE_EXT4
                          || enmFsTypeFile == RTFSTYPE_XFS)
                      {
diff --git a/debian/patches/28-no-selinux-fedora.patch b/debian/patches/28-no-selinux-fedora.patch
index 632fdaa..6d0e066 100644
--- a/debian/patches/28-no-selinux-fedora.patch
+++ b/debian/patches/28-no-selinux-fedora.patch
@@ -3,7 +3,7 @@ Author: Felix Geyer <fgeyer at debian.org>
 
 --- a/src/VBox/Additions/linux/Makefile.kmk
 +++ b/src/VBox/Additions/linux/Makefile.kmk
-@@ -345,9 +345,7 @@ lnx_add_inst-noexec_INST     = $(VBOX_LN
+@@ -347,9 +347,7 @@ lnx_add_inst-noexec_INST     = $(VBOX_LN
  lnx_add_inst-noexec_SOURCES  = \
  	$(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
  	$(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 2e55312..17ac91f 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
-@@ -4835,7 +4835,7 @@
+@@ -4836,7 +4836,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 5c1c000..58e0903 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
-@@ -2463,6 +2463,7 @@
+@@ -2466,6 +2466,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