This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 03d79c06d53a7e7f904b8796f5c54730230bcfec Author: Brandon Williams <[email protected]> AuthorDate: Tue Mar 9 17:20:50 2021 -0600 Revert "Update debian packaging to python3" This reverts commit 8c43f510a3a97977bc499b1b12c350169eb8076f. --- CHANGES.txt | 1 - debian/compat | 2 +- debian/control | 4 ++-- debian/rules | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index c174cd3..f1d9bb7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,5 @@ 3.0.25: * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades (CASSANDRA-16415) - * Update debian packaging for python3 (CASSANDRA-16396) * Avoid pushing schema mutations when setting up distributed system keyspaces locally (CASSANDRA-16387) Merged from 2.2: * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286) diff --git a/debian/compat b/debian/compat index b4de394..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +5 diff --git a/debian/control b/debian/control index 328502e..6a0128e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Eric Evans <[email protected]> Uploaders: Sylvain Lebresne <[email protected]> -Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), dpatch, bash-completion +Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python-dev (>= 2.7), dpatch, bash-completion Homepage: http://cassandra.apache.org Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git @@ -11,7 +11,7 @@ Standards-Version: 3.8.3 Package: cassandra Architecture: all -Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 3.6), ${misc:Depends}, ${python3:Depends} +Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7), ${misc:Depends} Recommends: ntp | time-daemon Suggests: cassandra-tools Conflicts: apache-cassandra1 diff --git a/debian/rules b/debian/rules index 5acb716..ff1d64d 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ build-stamp: patch-stamp $(ANT) generate-cql-html $(ANT) jar - cd pylib && python3 setup.py install --no-compile --install-layout deb \ + cd pylib && python setup.py install --no-compile --install-layout deb \ --root $(CURDIR)/debian/cassandra touch build-stamp @@ -40,7 +40,7 @@ install: build dh_testroot dh_installdirs dh_install - dh_python3 + dh_python2 # Copy in the jar and symlink to something stable dh_install build/apache-cassandra-$(VERSION).jar \ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
