[libreoffice] 01/01: we consider java6_architectures as Java arch, so let's remove the Java5 alternatives

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 5b1a56b576f58a4ff451ba631bbc7347236de9ee
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jun 24 16:09:44 2017 +0200

    we consider java6_architectures as Java arch, so let's remove the Java5 alternatives
---
 changelog | 8 ++++++++
 rules     | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index acfe7b0..890cf0e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - clean up JRE Depends; we consider java6_architectures as Java arch, so
+      let's remove the Java5 alternatives
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 24 Jun 2017 16:09:11 +0200
+
 libreoffice (1:5.3.4-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/rules b/rules
index fccf784..b9efcaf 100755
--- a/rules
+++ b/rules
@@ -1033,12 +1033,11 @@ ifeq "$(ENABLE_JAVA)" "y"
     endif
   endif
   ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386))
-	JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
+	JAVA_RUNTIME_DEPENDS += | sun-java6-jre
   endif
-	JAVA_RUNTIME_DEPENDS += | java5-runtime
+	JAVA_RUNTIME_DEPENDS += | java6-runtime
 	# Suns Java "packages"
 	JAVA_RUNTIME_DEPENDS += | jre
-	MEDIAWIKI_JAVA_RUNTIME_DEPENDS = $(shell echo $(JAVA_RUNTIME_DEPENDS) | sed -e "s/sun-java5-jre//" | sed -e "s/java5-runtime/java6-runtime/")
 export JAVA_HOME
 	CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
 	JAVA_COMMON_DEPENDS= , libreoffice-java-common
@@ -3496,7 +3495,7 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 endif
 ifeq "$(ENABLE_MEDIAWIKI)" "y"
 	dh_gencontrol -plibreoffice-wiki-publisher -- \
-		-V'java-runtime-depends=$(MEDIAWIKI_JAVA_RUNTIME_DEPENDS)' \
+		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
 		-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
 endif
 ifeq "$(ENABLE_NLPSOLVER)" "y"

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