natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Update debian packaging to python3" 

This reverts commit 8c43f510a3.
This commit is contained in:
Brandon Williams 2021-03-09 17:20:50 -06:00
parent 6524903c22
commit cf0be97894
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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:
* Fix centos packaging for arm64, >=3.0 rpm's now require python3 (CASSANDRA-16477)

2
debian/compat vendored
View File

@ -1 +1 @@
11
5

4
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: misc
Priority: extra
Maintainer: Eric Evans <eevans@apache.org>
Uploaders: Sylvain Lebresne <slebresne@apache.org>
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

4
debian/rules vendored
View File

@ -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 \