[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 03/05: also warn in binary-indep when using gcj



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

rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.

commit f0d7393180bbc2a6d4c68199d740a3c3a4f0d70b
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Oct 10 15:54:47 2015 +0200

    also warn in binary-indep when using gcj
---
 rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules b/rules
index 4ab5003..d2caf8e 100755
--- a/rules
+++ b/rules
@@ -3378,7 +3378,10 @@ binary-indep: $(GSI_EXPORT_STAMP) $(STAMP_DIR)/binary-indep
 $(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep debian/control $(STAMP_DIR)/maintscripts $(STAMP_DIR)/langpacks
 ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
 	echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	echo "For uploads with binary-all packages, please use arches where Java is enabled!!!!!"
+	echo "For uploads with binary-all packages, please use arches where Java is enabled"
+  ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
+	echo "and where Java used is OpenJDK"
+  endif
 	echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 endif
 	dh_testdir

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


Reply to: