[Debian-ha-commits] [pcs] 08/14: d/rules: update build rules for python3

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository pcs.

commit 4415bde23a71dec0f40d86d67362f386b4c64cbc
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Oct 13 19:12:42 2017 +0200

    d/rules: update build rules for python3
---
 debian/rules | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index c76307d..5c4c5ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,39 +3,35 @@
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
-# see FEATURE AREAS in dpkg-buildflags(1)
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# Ensure that we link against all needed libraries (cf. Policy 10.2)
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
-
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with python2
+	dh $@ --with python3
 
 override_dh_missing:
 	dh_missing --fail-missing
 
 override_dh_clean:
 	dh_clean --exclude="corosync.conf.orig"
-	rm -rf build pcs/usage.pyc pcs/bash_completion.d.pcs pcs.egg-info
+	rm -rf build pcs/usage.pyc pcs/bash_completion.d.pcs pcs.egg-info setup.cfg
 
 override_dh_auto_build:
 	echo "Bundler decoupled from build system"
 
 override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/tmp
+
 	# Make pcs
 	$(MAKE) install \
 		PREFIX=/usr \
 		DESTDIR=$(CURDIR)/debian/tmp \
-		PYTHON_SITELIB=/usr/lib/python2.7/dist-packages \
+		PYTHON_SITELIB=/usr/lib/python3/dist-packages \
 		install_settings=true
+
 	# Make pcsd
 	$(MAKE) install_pcsd \
 		PREFIX=/usr \
 		DESTDIR=$(CURDIR)/debian/tmp \
-		PYTHON_SITELIB=/usr/lib/python2.7/dist-packages \
+		PYTHON_SITELIB=/usr/lib/python3/dist-packages \
 		BUILD_GEMS=false \
 		systemddir=/lib/systemd \
 		SYSTEMCTL_OVERRIDE=true
@@ -43,7 +39,7 @@ override_dh_auto_install:
 	# Always install the init script
 	install -m 755 -D pcsd/pcsd.debian $(CURDIR)/debian/tmp/etc/init.d/pcsd
 
-	# remove embedded fonts
+	# Remove embedded fonts
 	set -e && cd $(CURDIR)/debian/tmp/usr/share/pcsd/public/css && \
 	for ttf in LiberationSans-Bold.ttf LiberationSans-BoldItalic.ttf \
 		   LiberationSans-Italic.ttf LiberationSans-Regular.ttf; \
@@ -51,9 +47,9 @@ override_dh_auto_install:
 		ln -sf /usr/share/fonts/truetype/liberation/$$ttf $$ttf; \
 	done
 
-override_dh_python2:
-	dh_python2 -p pcs --skip-private
-	dh_python2 -p pcs /usr/share/pcsd
+override_dh_python3:
+	dh_python3 -p pcs --skip-private
+	dh_python3 -p pcs /usr/share/pcsd
 
 override_dh_installinit:
 	dh_installinit --onlyscripts --name=pcsd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git