You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/03/09 23:24:02 UTC
[cassandra] branch cassandra-3.0 updated (3018499 -> cf0be97)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 3018499 Merge branch 'cassandra-2.2' into cassandra-3.0
new c8d2394 Revert "Remove python3:Depends from Debian packaging"
new 6524903 Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
new cf0be97 Revert "Update debian packaging to python3"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 -
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/03: Revert "Ninja update debian packaging to python3
from python for CASSANDRA-16478"
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6524903c22407504d55f29410d2e7f709104b8fd
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Mar 9 17:20:01 2021 -0600
Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
This reverts commit c775ea3fa77bb661f405d8ebba738546518ac18e.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index b256d98..328502e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime, adduser, python3 (>= 3.6), ${misc:Depends}, ${python3:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 3.6), ${misc:Depends}, ${python3:Depends}
Recommends: ntp | time-daemon
Suggests: cassandra-tools
Conflicts: apache-cassandra1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/03: Revert "Remove python3:Depends from Debian
packaging"
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c8d239436f5027745e91cec07d0024ab01c7e9dd
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Mar 9 17:19:49 2021 -0600
Revert "Remove python3:Depends from Debian packaging"
This reverts commit 2022cfe073af0a0ba311c80937e6f5c063412200.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 8028f5a..b256d98 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime, adduser, python3 (>= 3.6), ${misc:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python3 (>= 3.6), ${misc:Depends}, ${python3:Depends}
Recommends: ntp | time-daemon
Suggests: cassandra-tools
Conflicts: apache-cassandra1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 03/03: Revert "Update debian packaging to python3"
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cf0be978949e323526fd9e87fe155a57c582b007
Author: Brandon Williams <br...@apache.org>
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 c9aba6a..e015772 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:
* Fix centos packaging for arm64, >=3.0 rpm's now require python3 (CASSANDRA-16477)
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 <ee...@apache.org>
Uploaders: Sylvain Lebresne <sl...@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
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org