[Pkg-virtualbox-commits] [virtualbox] 04/05: Path refresh

Fri Feb 13 14:48:23 UTC 2015

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

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

commit 2c00d0d0a2fb99294ca743ea83855a8df9707d99
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Feb 13 11:00:46 2015 +0100

    Path refresh
---
 debian/changelog                                    |  6 ++++++
 debian/patches/02-gsoap-build-fix.patch             |  2 +-
 debian/patches/06-xsession.patch                    |  6 +++---
 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/32-disable-guest-version-check.patch | 13 ++++++-------
 debian/patches/36-fix-vnc-version-string.patch      |  2 +-
 8 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80c6fff..800fec8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (4.3.22-dfsg-1) UNRELEASED; urgency=medium
+
+  * Imported Upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 13 Feb 2015 10:53:56 +0100
+
 virtualbox (4.3.20-dfsg-1) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
index df9fe79..459f454 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -3,7 +3,7 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk
 ===================================================================
 --- virtualbox-git-orig.orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:32:51.211124975 -0500
 +++ virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:36:04.531133954 -0500
-@@ -683,7 +683,7 @@
+@@ -685,7 +685,7 @@
  : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
diff --git a/debian/patches/06-xsession.patch b/debian/patches/06-xsession.patch
index 780da61..1690b25 100644
--- a/debian/patches/06-xsession.patch
+++ b/debian/patches/06-xsession.patch
@@ -6,9 +6,9 @@ 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
 @@ -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
+    # This script can also be triggered by a connection over SSH, which is not
+    # what 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.
 -  /usr/bin/VBoxClient --clipboard
 -  /usr/bin/VBoxClient --checkhostversion
 -  /usr/bin/VBoxClient --display
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 056c0b8..747a43e 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
-@@ -3681,34 +3681,12 @@
+@@ -3686,34 +3686,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 6d0e066..848ef2c 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
-@@ -347,9 +347,7 @@ lnx_add_inst-noexec_INST     = $(VBOX_LN
+@@ -344,9 +344,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 54c8c09..ba48ab3 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
-@@ -5013,7 +5013,7 @@
+@@ -5039,7 +5039,7 @@
  TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
  TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/32-disable-guest-version-check.patch b/debian/patches/32-disable-guest-version-check.patch
index 53eccca..844aa06 100644
--- a/debian/patches/32-disable-guest-version-check.patch
+++ b/debian/patches/32-disable-guest-version-check.patch
@@ -3,12 +3,11 @@ Author: Felix Geyer <fgeyer at debian.org>
 
 --- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
 +++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
-@@ -43,6 +43,8 @@ public:
+@@ -39,6 +39,7 @@ public:
  
-     virtual int showNotify(const char *pcHeader, const char *pcBody)
-     {
-+        return VINF_SUCCESS;
-+
-         int rc;
+ static int showNotify(const char *pcHeader, const char *pcBody)
+ {
++    return VINF_SUCCESS;
+     int rc;
  # ifdef VBOX_WITH_DBUS
-         DBusConnection *conn;
+     DBusConnection *conn;
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 01e32db..9060c6d 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
-@@ -2497,6 +2497,7 @@
+@@ -2501,6 +2501,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

