[Debian-ha-commits] [pcs] 06/09: Updated patches 0007 0011 and 0012

[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 f3b7c66e67cd990dc4a40eb30cfe0940dc58926e
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun May 3 23:23:52 2015 -0400

    Updated patches 0007 0011 and 0012
    
     - Install the init script pcsd/pcsd to /etc/init.d/ whether
       systemd is used on the system or not
     - Install pcsd.conf to /etc/default/ as it's not an upstart
       file
     - Update uninstall paths for pcsd
    
    Change-Id: Ic82540e0aefbb6944b8734a466d0bd9a407db36a
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...ix-pcsd.conf-destination-in-pcsd-makefile.patch |  2 +-
 ...0011-Change-pcsd-destination-to-usr-share.patch | 16 +++++++++--
 .../0012-Fix-check-for-systemctl-on-Debian.patch   | 33 ++++++++++++++--------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch b/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
index e382bd3..536b53c 100644
--- a/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
+++ b/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
@@ -20,7 +20,7 @@ index 0bc1767..6cf519b 100644
  	mkdir -p ${DESTDIR}${PREFIX}/lib/
  	cp -r pcsd ${DESTDIR}${PREFIX}/lib/
 -	install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/sysconfig/pcsd
-+	install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/init/pcsd.conf
++	install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/default/pcsd.conf
  	install -d ${DESTDIR}/etc/pam.d
  	install  pcsd/pcsd.pam ${DESTDIR}/etc/pam.d/pcsd
  	install -m 700 -d ${DESTDIR}/var/lib/pcsd
diff --git a/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch b/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
index 80ef8c2..a7e1a14 100644
--- a/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
+++ b/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
@@ -5,15 +5,16 @@ Subject: Change pcsd destination to usr share
  - By default pcsd/Makefile installs pcsd to usr/lib/pcsd, but 
    lintian wants those arch indep files to live in usr/share, 
    thus the patch was born.
+ - Uninstall updated as well
 
 Change-Id: Iffb2e1bc8f1119dbc3181c1ffedd70fc57276a5f
 Signed-off-by: Richard B Winters <rik at mmogp.com>
 ---
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index f67a9b8..5768e62 100644
+index f67a9b8..c8f2c89 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -37,8 +37,8 @@ install: bash_completion
@@ -27,3 +28,12 @@ index f67a9b8..5768e62 100644
  	install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/init/pcsd.conf
  	install -d ${DESTDIR}/etc/pam.d
  	install  pcsd/pcsd.pam ${DESTDIR}/etc/pam.d/pcsd
+@@ -54,7 +54,7 @@ endif
+ uninstall:
+ 	rm -f ${DESTDIR}${PREFIX}/sbin/pcs
+ 	rm -rf ${DESTDIR}${PYTHON_SITELIB}/pcs
+-	rm -rf ${DESTDIR}${PREFIX}/lib/pcsd
++	rm -rf ${DESTDIR}${PREFIX}/share/pcsd
+ ifeq ($(IS_SYSTEMCTL),true)
+ 	rm -f ${DESTDIR}/usr/lib/systemd/system/pcsd.service
+ else
diff --git a/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch b/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch
index 7f44c4b..ec63b4e 100644
--- a/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch
+++ b/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch
@@ -1,21 +1,20 @@
 From: Richard B Winters <rik at mmogp.com>
-Date: Sun, 3 May 2015 21:57:53 -0400
+Date: Sun, 3 May 2015 23:44:43 -0400
 Subject: Fix check for systemctl on Debian
 
- - On debian systemctl is not usually in /usr/bin, but rather 
-   in /bin. Well test for systemd using a different means.
- - If systemd is detected, we'll still put the init script 
-   into the proper installation directory, we just won't 
-   register it with update-rc.d
+ - By default the Makefile checks for /usr/bin/systemctl in 
+   order to determine if systemd is utilized by the 
+   environment. On debian we can do this by checking pid 1
+ - Install and Uninstall updated as well
 
-Change-Id: I3db2cc133bbe8401fc7c43ccc0bd9735b79a3788
+Change-Id: I0503b872f5b27dd119f7c5cb106fb53e0d566fdb
 Signed-off-by: Richard B Winters <rik at mmogp.com>
 ---
- Makefile | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
+ Makefile | 17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 5768e62..0e1a7ec 100644
+index c8f2c89..b85e236 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -8,14 +8,7 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
@@ -34,7 +33,7 @@ index 5768e62..0e1a7ec 100644
  
  MANDIR=/usr/share/man
  
-@@ -47,9 +40,8 @@ install_pcsd:
+@@ -47,19 +40,17 @@ install_pcsd:
  ifeq ($(IS_SYSTEMCTL),true)
  	install -d ${DESTDIR}/lib/systemd/system
  	install -m 644 pcsd/pcsd.service ${DESTDIR}/lib/systemd/system/
@@ -45,3 +44,15 @@ index 5768e62..0e1a7ec 100644
  
  uninstall:
  	rm -f ${DESTDIR}${PREFIX}/sbin/pcs
+ 	rm -rf ${DESTDIR}${PYTHON_SITELIB}/pcs
+ 	rm -rf ${DESTDIR}${PREFIX}/share/pcsd
+ ifeq ($(IS_SYSTEMCTL),true)
+-	rm -f ${DESTDIR}/usr/lib/systemd/system/pcsd.service
+-else
+-	rm -f ${DESTDIR}/${initdir}/pcsd
++	rm -f ${DESTDIR}/lib/systemd/system/pcsd.service
+ endif
++	rm -f ${DESTDIR}/${initdir}/pcsd
+ 	rm -f ${DESTDIR}/etc/pam.d/pcsd
+ 	rm -rf ${DESTDIR}/var/lib/pcsd
+ 

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