[Debian-ha-commits] [pcs] 01/09: Multiple edits;

[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 4fabda1da22aef4692602dbc2a954f947dea162e
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun May 3 21:39:47 2015 -0400

    Multiple edits;
    
     - Added patch to fix file locations in pcsd.service
     - Added patch to fix pcsd.service desitnation in Makefile
     - Added patch to change pcsd install directory to usr/share
    
    Change-Id: I9762457d78052612ffb3d7c740b28dac4ae89f86
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 .../0009-Fix-file-locations-in-pcsd.service.patch  | 29 ++++++++++++++++++++++
 ...-Fix-pcsd.service-destination-in-Makefile.patch | 28 +++++++++++++++++++++
 ...0011-Change-pcsd-destination-to-usr-share.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  3 +++
 4 files changed, 89 insertions(+)

diff --git a/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch b/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
new file mode 100644
index 0000000..b92d6be
--- /dev/null
+++ b/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
@@ -0,0 +1,29 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Sun, 3 May 2015 20:49:44 -0400
+Subject: Fix file locations in pcsd.service
+
+ - The locations for the system configuration and the init 
+   script needed updating for Debian
+
+Change-Id: Ifa7600fc56a80a5631bbdb731a68e8f18b4d17e0
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ pcsd/pcsd.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pcsd/pcsd.service b/pcsd/pcsd.service
+index 5254905..77b0cbe 100644
+--- a/pcsd/pcsd.service
++++ b/pcsd/pcsd.service
+@@ -2,9 +2,9 @@
+ Description=PCS GUI and remote configuration interface
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/pcsd
++EnvironmentFile=-/etc/init/pcsd.conf
+ WorkingDirectory=/var/lib/pcsd
+-ExecStart=/usr/lib/pcsd/pcsd start
++ExecStart=/etc/init.d/pcsd start
+ Type=notify
+ NotifyAccess=all
+ 
diff --git a/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch b/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
new file mode 100644
index 0000000..f0b1441
--- /dev/null
+++ b/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
@@ -0,0 +1,28 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Sun, 3 May 2015 20:54:20 -0400
+Subject: Fix pcsd.service destination in Makefile
+
+ - The pcsd.service file is installed to /usr/lib/systemd/
+   system by default, this requires changing on debian systems
+
+Change-Id: If33c6f26eb50e218ea1b97ee8f2bc0f616e23784
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6cf519b..f67a9b8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,8 +45,8 @@ install_pcsd:
+ 	install -m 700 -d ${DESTDIR}/var/lib/pcsd
+ 	install -m 644 -D pcsd/pcsd.logrotate ${DESTDIR}/etc/logrotate.d/pcsd
+ ifeq ($(IS_SYSTEMCTL),true)
+-	install -d ${DESTDIR}/usr/lib/systemd/system/
+-	install -m 644 pcsd/pcsd.service ${DESTDIR}/usr/lib/systemd/system/
++	install -d ${DESTDIR}/lib/systemd/system
++	install -m 644 pcsd/pcsd.service ${DESTDIR}/lib/systemd/system/
+ else
+ 	install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
+ endif
diff --git a/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch b/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
new file mode 100644
index 0000000..80ef8c2
--- /dev/null
+++ b/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
@@ -0,0 +1,29 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Sun, 3 May 2015 21:00:20 -0400
+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.
+
+Change-Id: Iffb2e1bc8f1119dbc3181c1ffedd70fc57276a5f
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f67a9b8..5768e62 100644
+--- a/Makefile
++++ b/Makefile
+@@ -37,8 +37,8 @@ install: bash_completion
+ 
+ install_pcsd:
+ 	mkdir -p ${DESTDIR}/var/log/pcsd
+-	mkdir -p ${DESTDIR}${PREFIX}/lib/
+-	cp -r pcsd ${DESTDIR}${PREFIX}/lib/
++	mkdir -p ${DESTDIR}${PREFIX}/share/
++	cp -r pcsd ${DESTDIR}${PREFIX}/share/
+ 	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
diff --git a/debian/patches/series b/debian/patches/series
index 52efcbb..d194e3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,6 @@
 0006-Fix-pcsd-location-and-args-in-init-script.patch
 0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
 0008-Fix-conf-directory-in-pcsd-init.patch
+0009-Fix-file-locations-in-pcsd.service.patch
+0010-Fix-pcsd.service-destination-in-Makefile.patch
+0011-Change-pcsd-destination-to-usr-share.patch

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