[openjfx] 01/01: Fixed the build failure when building only the arch indep packages (Closes: #825276)

[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 764ef1ea16fcd3d03470f9c8918e01cac6fee029
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 25 22:53:17 2016 +0200

    Fixed the build failure when building only the arch indep packages (Closes: #825276)
---
 debian/changelog | 8 ++++++++
 debian/rules     | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c3bdc8..922dd7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjfx (8u91-b14-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure when building only the arch indep packages
+    (Closes: #825276)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 25 May 2016 22:50:36 +0200
+
 openjfx (8u91-b14-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 3a610ec..0b1dc01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,9 +24,10 @@ jvm_arch   := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_
 %:
 	dh $@ --buildsystem=gradle
 
-override_dh_auto_build-arch:
+override_dh_auto_configure-arch:
 	cp debian/gradle.properties .
 
+override_dh_auto_build-arch:
 	# replace the non-free JavaScript minifier with a noop equivalent
 	cp debian/jsmin-noop.py modules/web/src/main/native/Source/JavaScriptCore/inspector/scripts/jsmin.py
 
@@ -40,8 +41,8 @@ override_dh_auto_build-arch:
 
 	$(SET_JAVA_OPTS) dh_auto_build -- sdk -x javadoc -x src
 
-override_dh_auto_build-indep:
-	$(SET_JAVA_OPTS) dh_auto_build -- javadoc src
+override_dh_auto_build-indep: override_dh_auto_build-arch
+	$(SET_JAVA_OPTS) dh_auto_build -- javadoc src -PBUILD_JAVADOC=true -PBUILD_SRC_ZIP=true
 
 override_dh_install-arch:
 	dh_install -a

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