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

[Gianfranco Costamagna]

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

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

commit c7e6b1a55a4189ab1ad93510aa114b0428ca9cc1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Sep 12 17:24:09 2014 +0200

    New upstream release, patch refresh
---
 debian/changelog                               |  7 ++++++
 debian/patches/02-gsoap-build-fix.patch        |  2 +-
 debian/patches/06-xsession.patch               | 31 +++++++++++++-------------
 debian/patches/18-system-xorg.patch            |  4 ++--
 debian/patches/29-fix-ftbfs-as-needed.patch    |  2 +-
 debian/patches/36-fix-vnc-version-string.patch |  2 +-
 6 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 33323cf..064eabe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.3.16-dfsg-1) UNRELEASED; urgency=medium
+
+  * Imported Upstream version 4.3.16-dfsg
+  * Patch refresh.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 12 Sep 2014 17:15:35 +0200
+
 virtualbox (4.3.14-dfsg-1) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
index 82d1436..df9fe79 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -11,4 +11,4 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk
 +	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
  	$(APPEND) $@ done
  
- # copy the generated headers and stuff. This has to be a separate rule if we
+ # Copy the generated headers and stuff.  This was split into a separate rule
diff --git a/debian/patches/06-xsession.patch b/debian/patches/06-xsession.patch
index fdab3cb..780da61 100644
--- a/debian/patches/06-xsession.patch
+++ b/debian/patches/06-xsession.patch
@@ -5,20 +5,19 @@ Index: virtualbox/src/VBox/Additions/x11/Installer/98vboxadd-xclient
 ===================================================================
 --- virtualbox.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2013-11-19 03:40:59.137475714 -0500
 +++ virtualbox/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2013-11-19 03:40:59.133475714 -0500
-@@ -42,11 +42,11 @@
-     no_display=1
+@@ -28,9 +28,9 @@ done
+ # we had in mind, so we do not start VBoxClient in that case.  We do not use
+ # "exit" here as this script is "source"d, not executed.
+ if test -z "${SSH_CONNECTION}"; then
+-  /usr/bin/VBoxClient --clipboard
+-  /usr/bin/VBoxClient --checkhostversion
+-  /usr/bin/VBoxClient --display
+-  /usr/bin/VBoxClient --seamless
+-  /usr/bin/VBoxClient --draganddrop
++  /usr/bin/VBoxClient --clipboard || true
++  /usr/bin/VBoxClient --checkhostversion || true
++  /usr/bin/VBoxClient --display || true
++  /usr/bin/VBoxClient --seamless || true
++  /usr/bin/VBoxClient --draganddrop || true
  fi
- 
--/usr/bin/VBoxClient --clipboard
--/usr/bin/VBoxClient --checkhostversion
-+/usr/bin/VBoxClient --clipboard || true
-+/usr/bin/VBoxClient --checkhostversion || true
- test -z "$no_display" &&
--    /usr/bin/VBoxClient --display
-+    /usr/bin/VBoxClient --display || true
- test -z "$no_display" &&
--    /usr/bin/VBoxClient --seamless
-+    /usr/bin/VBoxClient --seamless || true
- test -z "$no_display" &&
--    /usr/bin/VBoxClient --draganddrop
-+    /usr/bin/VBoxClient --draganddrop || true
+
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index 8758d8b..a94cd87 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -12,8 +12,8 @@ Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
 -  LIBRARIES += \
 -  	VBoxGuestR3LibXFree86
   endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+   LIBRARIES += \
 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
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index e8920d5..b2bb792 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
-@@ -4988,7 +4988,7 @@
+@@ -5005,7 +5005,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 bd3dc4a..4c977a8 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
-@@ -2487,6 +2487,7 @@
+@@ -2489,6 +2489,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