[Debian-ha-commits] [pcs] 02/02: Updated rules to use the new Makefile variable install_settings

[Richard Winters]

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

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

commit d89e14857a847a23e2cee4cb1ba18e4d3e7dd09c
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu May 7 05:43:33 2015 -0400

    Updated rules to use the new Makefile variable install_settings
    
     - Helps upport MultiArch by allowing use of alternate binary
       locations for pacemaker binaries on Debian, by updating
       paths to said binaries in alternate versions of settings.py
     - Updated dh_compress to remove executable flag from new
       settings.py
    
    Change-Id: I0c7d80c4727916dd9ca0492a5a4c7464b4d5ee0e
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/rules | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 3c3339d..1ec14da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,8 @@ override_dh_auto_install:
 	$(MAKE) install \
 		PREFIX=/usr \
 		DESTDIR=$(CURDIR)/debian/tmp \
-		PYTHON_SITELIB=/usr/lib/python2.7/dist-packages
+		PYTHON_SITELIB=/usr/lib/python2.7/dist-packages \
+		install_settings=true
 # Make pcsd
 	$(MAKE) install_pcsd \
 		PREFIX=/usr \
@@ -51,6 +52,7 @@ override_dh_compress:
 	chmod -x $(CURDIR)/debian/pcs/usr/share/pcsd/public/css/*
 	chmod -x $(CURDIR)/debian/pcs/etc/pam.d/pcsd
 	chmod -x $(CURDIR)/debian/pcs/etc/bash_completion.d/pcs
+	chmod -x $(CURDIR)/debian/pcs/usr/lib/python*/*-packages/pcs/settings.py
 	chmod a+x $(CURDIR)/debian/pcs/usr/share/pcsd/pcsd.debian
 	chmod 755 $(CURDIR)/debian/pcs/usr/share/pcsd/public/css/images/
 	dh_compress

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