[openjfx] 01/03: Install the jar files in an arch independent directory (Closes: #764241)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 7270fbb8a4a846a2a967f2e4c4c22fd3c9a736a3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 21 11:41:23 2014 +0200

    Install the jar files in an arch independent directory (Closes: #764241)
---
 debian/changelog |  1 +
 debian/rules     | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7254ffe..bc3f5c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 openjfx (8u20-b26-3) UNRELEASED; urgency=medium
 
+  * Install the jar files in an arch independent directory (Closes: #764241)
   * Fixed a build failure on slow machines by increasing the timeout
     for processing the ANTLR grammar.
   * Disabled the architecture verification in build.gradle to attempt building
diff --git a/debian/rules b/debian/rules
index 43f8e59..a774145 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,8 @@
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-export JAVA_HOME  = /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
+export JAVA_HOME    = /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
+export OPENJFX_HOME = /usr/share/java/openjfx
 
 %:
 	dh $@ 
@@ -21,10 +22,16 @@ override_dh_install:
 	dh_link -popenjfx $(JAVA_HOME)/bin/javafxpackager           /usr/bin/javafxpackager
 	dh_link -popenjfx $(JAVA_HOME)/man/man1/javafxpackager.1.gz /usr/share/man/man1/javafxpackager.1.gz
 
-	dh_install -plibopenjfx-java build/sdk/lib                 $(JAVA_HOME)
-	dh_install -plibopenjfx-java build/sdk/rt/lib/*.jar        $(JAVA_HOME)/jre/lib
-	dh_install -plibopenjfx-java build/sdk/rt/lib/*.properties $(JAVA_HOME)/jre/lib
-	dh_install -plibopenjfx-java build/sdk/rt/lib/ext          $(JAVA_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/lib                  $(OPENJFX_HOME)
+	dh_install -plibopenjfx-java build/sdk/rt/lib/*.jar         $(OPENJFX_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/rt/lib/*.properties  $(OPENJFX_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/rt/lib/ext           $(OPENJFX_HOME)/jre/lib
+
+	dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/jfxswt.jar        $(JAVA_HOME)/jre/lib/jfxswt.jar
+	dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/javafx.properties $(JAVA_HOME)/jre/lib/javafx.properties
+	dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/ext/jfxrt.jar     $(JAVA_HOME)/jre/lib/ext/jfxrt.jar
+	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
 

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