This is an automated email from the git hooks/post-receive script. doko pushed a commit to branch master in repository openjfx.
commit 149b9a32a4e95aecd6d169e0398d673f23014a56 Author: Matthias Klose <[email protected]> Date: Tue Oct 6 11:59:40 2015 +0200 * Fix installation into the jre architecture directory. --- debian/changelog | 8 ++++++-- debian/rules | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index de13bcb..04586b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -openjfx (8u60-b27-1) UNRELEASED; urgency=medium +openjfx (8u60-b27-1ubuntu1) UNRELEASED; urgency=medium + [ Emmanuel Bourg ] * New upstream release - Refreshed the patches - Build with qt5-qmake instead of qt4-qmake @@ -9,7 +10,10 @@ openjfx (8u60-b27-1) UNRELEASED; urgency=medium * Fixed a build failure with Gradle 2.5 (Closes: #795851) * Depend on GStreamer 1.0 (Closes: #799280) - -- Emmanuel Bourg <[email protected]> Mon, 07 Sep 2015 23:40:56 +0200 + [ Matthias Klose ] + * Fix installation into the jre architecture directory. + + -- Matthias Klose <[email protected]> Tue, 06 Oct 2015 11:58:43 +0200 openjfx (8u40-b25-3) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 3076b01..1e52b83 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,10 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) export JAVA_HOME = /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH) export OPENJFX_HOME = /usr/share/java/openjfx +arch_map = alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i586 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32 + +jvmarch := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_ARCH_CPU)=%, $(arch_map)))) + %: dh $@ @@ -45,7 +49,7 @@ override_dh_install: dh_link -popenjfx $(OPENJFX_HOME)/lib/ant-javafx.jar $(JAVA_HOME)/lib/ant-javafx.jar dh_link -popenjfx $(OPENJFX_HOME)/lib/javafx-mx.jar $(JAVA_HOME)/lib/javafx-mx.jar - dh_install -plibopenjfx-jni build/sdk/rt/lib/$(DEB_HOST_ARCH) $(JAVA_HOME)/jre/lib + dh_install -plibopenjfx-jni build/sdk/rt/lib/$(jvmarch) $(JAVA_HOME)/jre/lib dh_install -popenjfx-source build/javafx-src.zip $(JAVA_HOME) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
