[libreoffice] 01/01: strip librhino-java from java:Depends, we use the internal one still..

[Rene Engelhard]

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

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

commit a1046e9d7d5455cb43507e8528878d66cb9a1cbc
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jul 15 17:43:26 2017 +0200

    strip librhino-java from java:Depends, we use the internal one still..
---
 changelog | 7 +++++++
 rules     | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/changelog b/changelog
index 6a58469..fd03ef5 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.4.0~rc2~2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - strip librhino-java from java:Depends, we use the internal one still..
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 15 Jul 2017 12:24:52 +0000
+
 libreoffice (1:5.4.0~rc2-1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/rules b/rules
index c6d5b1b..82f329d 100755
--- a/rules
+++ b/rules
@@ -3541,6 +3541,9 @@ ifeq "$(ENABLE_JAVA)" "y"
 			-Xlibreoffice-report-builder; \
         done
 endif
+	# and it adds a librhino-java Depends where we still use internal rhino
+	perl -pi -e "s/librhino-java//" \
+		debian/libreoffice-script-provider-js.substvars
 ifeq "$(BUILD_TEST_PACKAGE)" "y"
 	perl -pi -e 's/junit4/junit4 $(JUNIT_MIN_VER)/' \
 		debian/libreoffice-subsequentcheckbase.substvars

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