From d5930eae8660a1192c8235206f83c28c9bd471a1 Mon Sep 17 00:00:00 2001 From: Thomas Broyer Date: Mon, 10 Jul 2017 15:29:17 +0200 Subject: Allow Debian package to be installed alongside JDK 9 Update the documentation to instruct explicitly installing JDK 8. Fixes #3147 Change-Id: If92ff93b095bead043c9b069e000b7afbc0abca0 PiperOrigin-RevId: 161387193 --- scripts/packages/debian/BUILD | 3 --- scripts/packages/debian/control | 1 - 2 files changed, 4 deletions(-) (limited to 'scripts/packages') diff --git a/scripts/packages/debian/BUILD b/scripts/packages/debian/BUILD index 6048692034..4328f5a8d6 100644 --- a/scripts/packages/debian/BUILD +++ b/scripts/packages/debian/BUILD @@ -70,9 +70,6 @@ pkg_deb( name = "bazel-debian", architecture = "amd64", built_using = "bazel (HEAD)", - conflicts = [ - "openjdk-9-jdk", - ], data = ":debian-data", depends = select({ "//tools/jdk:jdk7": [ diff --git a/scripts/packages/debian/control b/scripts/packages/debian/control index 3253c5d22d..443240e5ca 100644 --- a/scripts/packages/debian/control +++ b/scripts/packages/debian/control @@ -10,7 +10,6 @@ Section: contrib/devel Priority: optional Architecture: amd64 Depends: google-jdk | java8-jdk | java8-sdk | oracle-java8-installer, g++, zlib1g-dev, bash-completion -Conflicts: openjdk-9-jdk Description: Bazel is a tool that automates software builds and tests. Supported build tasks include running compilers and linkers to produce executable programs and libraries, and assembling deployable packages -- cgit v1.2.3