Merge branch 'cassandra-3.0' into cassandra-3.11

CHANGES.txt

@@ -1,5 +1,6 @@
 3.11.11
 Merged from 3.0:
+ * 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)

debian/compat

@@ -1 +1 @@
-5
+11

debian/control

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

debian/rules

@@ -30,7 +30,7 @@ build-stamp: patch-stamp
 
 	$(ANT) generate-cql-html
 	$(ANT) jar
-	cd pylib && python setup.py install --no-compile --install-layout deb \
+	cd pylib && python3 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_python2
+	dh_python3
 
 	# Copy in the jar and symlink to something stable
 	dh_install build/apache-cassandra-$(VERSION).jar \