[Pkg-virtualbox-commits] [virtualbox] 01/01: Upload to unstable, with java9 compatibility patch

[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 18ae29640e8555af6f6015d4e79b98118e04ae76
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Apr 9 12:16:27 2018 +0200

    Upload to unstable, with java9 compatibility patch
---
 debian/changelog           |  7 +++++++
 debian/control             |  2 +-
 debian/patches/java9.patch | 15 +++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  2 --
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7c6254..12695c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (5.2.8-dfsg-6) unstable; urgency=medium
+
+  * Build with java9 (Closes: #894365)
+    - thanks Emmanuel Bourg for all the great help!
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 29 Mar 2018 19:05:29 +0200
+
 virtualbox (5.2.8-dfsg-5) unstable; urgency=medium
 
   * Fixup build on i386, by finding the correct java path here too.
diff --git a/debian/control b/debian/control
index 750f96b..bca7199 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Ritesh Raj Sarraf <rrs at debian.org>,
            Gianfranco Costamagna <locutusofborg at debian.org>
 Build-Depends: bzip2,
                debhelper (>= 10),
-               openjdk-8-jdk-headless,
+               default-jdk,
                dh-python,
                dh-systemd (>=1.5),
                dkms (>= 2.1.1.1),
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..61a724c
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,15 @@
+Index: virtualbox/Config.kmk
+===================================================================
+--- virtualbox.orig/Config.kmk
++++ virtualbox/Config.kmk
+@@ -7215,8 +7215,8 @@
+ else
+  VBOX_SEP = $(COLON)
+ endif
+-VBOX_JAVAC_OPTS   = -encoding UTF-8 -source 1.5 -target 1.5 -Xlint:unchecked
+-VBOX_JAVADOC_OPTS = -encoding UTF-8
++VBOX_JAVAC_OPTS   = -encoding UTF-8 -source 1.9 -target 1.9 -Xlint:unchecked --add-modules java.xml.ws
++VBOX_JAVADOC_OPTS = -encoding UTF-8 --add-modules java.xml.ws
+ 
+ 
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 34b5dfe..1dc8925 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
 37-python-3.6-support.patch
 fix-build.patch
 notify-send.patch
+java9.patch
diff --git a/debian/rules b/debian/rules
index e7315dd..171748c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,6 @@ export DEB_BUILD_HARDENING=1
 export DEB_BUILD_HARDENING_PIE=0
 export DEB_BUILD_HARDENING_FORMAT=0
 export DEB_BUILD_HARDENING_BINDNOW=0
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie,-format,-bindnow
 
@@ -69,7 +68,6 @@ override_dh_auto_build:
 	    VBOX_WITH_REGISTRATION_REQUEST= \
 	    VBOX_WITH_UPDATE_REQUEST= \
 	    KBUILD_VERBOSE=2 \
-	    VBOX_JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH) \
 	    VBOX_WITH_EXTPACK_VBOXDTRACE=
 
 	xsltproc --nonet --stringparam section.autolabel 1 \

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