[Pkg-virtualbox-commits] [virtualbox] 01/01: Upload again to unstable

[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 b75a05c9f205ab263732c6b2d0de1230d38df3f9
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Mar 19 08:19:45 2018 +0100

    Upload again to unstable
---
 debian/changelog | 6 ++++++
 debian/rules     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a6ce923..d7c6254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (5.2.8-dfsg-5) unstable; urgency=medium
+
+  * Fixup build on i386, by finding the correct java path here too.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 19 Mar 2018 08:19:14 +0100
+
 virtualbox (5.2.8-dfsg-4) unstable; urgency=medium
 
   * Force java8 to build, java9 makes the program FTBFS because
diff --git a/debian/rules b/debian/rules
index b6822ba..2c9ed2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ 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
 
@@ -68,7 +69,7 @@ override_dh_auto_build:
 	    VBOX_WITH_REGISTRATION_REQUEST= \
 	    VBOX_WITH_UPDATE_REQUEST= \
 	    KBUILD_VERBOSE=2 \
-	    VBOX_JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+	    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