This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch CASSANDRA-18642-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8904538a0835bc588bca1af2e3eed0c3804c5911 Author: Brandon Williams <[email protected]> AuthorDate: Sat Aug 22 14:10:04 2026 -0500 Change Debian pylib location to /usr/share/cassandra --- debian/control | 2 +- debian/rules | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 7e712018e4..c00cb4c6b9 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-17-jdk-headless | openjdk-11-jdk-headless | java17-sdk | java11-sdk, ant (>= 1.10), ant-optional (>= 1.10), dh-python, python3-dev (>= 3.6), quilt, bash-completion +Build-Depends: debhelper (>= 11), openjdk-17-jdk-headless | openjdk-11-jdk-headless | java17-sdk | java11-sdk, ant (>= 1.10), ant-optional (>= 1.10), 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 diff --git a/debian/rules b/debian/rules index b3de486117..c5a5e155e3 100755 --- a/debian/rules +++ b/debian/rules @@ -44,8 +44,6 @@ build-stamp: $(QUILT_STAMPFN) $(ANT) generate-cql-html $(ANT) jar -Dno-checkstyle=true -Drat.skip=true -Dant.gen-doc.skip=true - cd pylib && python3 setup.py install --no-compile --install-layout deb \ - --root $(CURDIR)/debian/cassandra touch build-stamp @@ -55,6 +53,13 @@ install: build dh_installdirs dh_install + # Install the cqlsh python library in a Python-version independent location; + # cqlsh.py adds it to sys.path at runtime. Installing via 'setup.py install' + # into the system dist-packages would make this noarch package depend on the + # build machine's Python packaging layout (and any compiled extension module) + dh_install pylib/cqlshlib usr/share/cassandra/pylib + find debian/cassandra/usr/share/cassandra/pylib -name __pycache__ -type d -exec rm -rf {} + + # Copy in the jar and symlink to something stable dh_install $(BUILD_DIR)/apache-cassandra-$(VERSION).jar \ usr/share/cassandra --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
