From 988a855a80b50b23e5a43746f5af0b84c541e946 Mon Sep 17 00:00:00 2001 From: Stefan Miklosovic Date: Wed, 30 Aug 2023 20:47:47 +0200 Subject: [PATCH] Fix Depends and Build-Depends for Java for Debian packages patch by Stefan Miklosovic; reviewed by Brandon Williams from CASSANDRA-18809 --- CHANGES.txt | 1 + debian/control | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 0d67ab6cf7..ac84102522 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.0-alpha2 + * Fix Depends and Build-Depends for Java for Debian packages (CASSANDRA-18809) * Update command line flags --add-exports and --add-opens for JDK17 (CASSANDRA-18439) * Update commons-lang3 to 3.13.0 (CASSANDRA-18789) * Forbid SAI indexes with analysis options on primary key columns (CASSANDRA-18782) diff --git a/debian/control b/debian/control index 4ccaaaac2f..74f17144c1 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,15 @@ Section: misc Priority: extra Maintainer: Eric Evans Uploaders: Sylvain Lebresne -Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk | openjdk-11-jdk | java11-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), quilt, bash-completion -Homepage: http://cassandra.apache.org +Build-Depends: debhelper (>= 11), openjdk-11-jdk | openjdk-11-jdk-headless | openjdk-17-jdk | openjdk-17-jdk-headless, ant (>= 1.10), ant-optional (>= 1.10), dh-python, python3-dev (>= 3.6), quilt, bash-completion +Homepage: https://cassandra.apache.org Vcs-Git: https://gitbox.apache.org/repos/asf/cassandra.git Vcs-Browser: https://gitbox.apache.org/repos/asf?p=cassandra.git Standards-Version: 3.8.3 Package: cassandra Architecture: all -Depends: openjdk-8-jre-headless | java8-runtime | openjdk-11-jre-headless | java11-runtime, adduser, python3 (>= 3.6), procps, ${misc:Depends} +Depends: openjdk-11-jre-headless | openjdk-17-jre-headless | openjdk-11-jre | openjdk-17-jre, adduser, python3 (>= 3.6), procps, ${misc:Depends} Recommends: ntp | time-daemon Suggests: cassandra-tools Conflicts: apache-cassandra1