[Debian-ha-commits] [pcs] 02/02: Patched Makefile in order to not install upstream pcsd init

[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 2fc82b893b087e5779ff02863ae1fa1ce71f9e40
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue May 5 16:06:57 2015 -0400

    Patched Makefile in order to not install upstream pcsd init
    
     - Series updated
    
    Change-Id: I3da8f7c0acf8630defb72d1435c064407d7e22de
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...-Do-not-install-upstream-pcsd-init-script.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0009-Do-not-install-upstream-pcsd-init-script.patch b/debian/patches/0009-Do-not-install-upstream-pcsd-init-script.patch
new file mode 100644
index 0000000..b89dbbf
--- /dev/null
+++ b/debian/patches/0009-Do-not-install-upstream-pcsd-init-script.patch
@@ -0,0 +1,26 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Tue, 5 May 2015 16:04:56 -0400
+Subject: Do not install upstream pcsd init script
+
+ - Remove instruction to install the upstream pcsd init from 
+   the Makefile, as we will install a maintainer provided init 
+   script instead
+
+Change-Id: I1af25537d60d59be8c92cfb481b104bd36e9df30
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index e0073e3..f3c412b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,6 @@ ifeq ($(IS_SYSTEMCTL),true)
+ 	install -d ${DESTDIR}/lib/systemd/system
+ 	install -m 644 pcsd/pcsd.service ${DESTDIR}/lib/systemd/system/
+ endif
+-	install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
+ 
+ uninstall:
+ 	rm -f ${DESTDIR}${PREFIX}/sbin/pcs
diff --git a/debian/patches/series b/debian/patches/series
index 82c279f..441a986 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-Fix-pcsd.service-destination-in-Makefile.patch
 0007-Change-pcsd-destination-to-usr-share.patch
 0008-Fix-check-for-systemctl-on-Debian.patch
+0009-Do-not-install-upstream-pcsd-init-script.patch

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