[Debian-ha-commits] [pcs] 03/05: Fixed spacing in Makefile via Patch 0001

[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 5e5de24563d10e3a474f5726601e2de43bdacc2d
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri May 8 06:23:25 2015 -0400

    Fixed spacing in Makefile via Patch 0001
    
    Change-Id: I25aad02135a0af38153a9aad40b873bcc15e21fc
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...eamline-upstream-for-compatibility-with-Debian.patch | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch b/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
index b0dd164..9b04aea 100644
--- a/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
+++ b/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
@@ -26,13 +26,13 @@ Summary of Changes for Debian:
 Change-Id: Ie06f5ed5232fbf00881f7c4a45c00a7822645d4c
 Signed-off-by: Richard B Winters <rik at mmogp.com>
 ---
- Makefile                                | 100 +++++++++++++++++++---
+ Makefile                                |  99 +++++++++++++++++++---
  pcs/settings.py.i386-linux-gnu.debian   |  19 +++++
  pcs/settings.py.x86_64-linux-gnu.debian |  19 +++++
  pcsd/pcsd.debian                        | 141 ++++++++++++++++++++++++++++++++
  pcsd/pcsd.pam.debian                    |   5 ++
  pcsd/pcsd.service.debian                |   9 ++
- 6 files changed, 283 insertions(+), 10 deletions(-)
+ 6 files changed, 282 insertions(+), 10 deletions(-)
  create mode 100644 pcs/settings.py.i386-linux-gnu.debian
  create mode 100644 pcs/settings.py.x86_64-linux-gnu.debian
  create mode 100755 pcsd/pcsd.debian
@@ -40,7 +40,7 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
  create mode 100644 pcsd/pcsd.service.debian
 
 diff --git a/Makefile b/Makefile
-index c37373b..6d2a295 100644
+index c37373b..68cf1c4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,3 +1,21 @@
@@ -65,7 +65,7 @@ index c37373b..6d2a295 100644
  ifndef PYTHON_SITELIB
    PYTHON_SITELIB=$(shell python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
  endif
-@@ -8,25 +26,60 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
+@@ -8,25 +26,59 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
    EXTRA_SETUP_OPTS="--install-layout=deb"
  endif
  
@@ -77,10 +77,9 @@ index c37373b..6d2a295 100644
 +ifeq ($(IS_DEBIAN),true)
 +  IS_SYSTEMCTL = $(shell if [ -d /var/run/systemd/system ] ; then echo true ; else echo false; fi)
 +  ifeq ($(IS_SYSTEMCTL),false)
-+  	ifeq ($(SYSTEMCTL_OVERRIDE),true)
-+	  echo "Warning: systemd is not detected... installing service file anyway..."
-+	  IS_SYSTEMCTL=true
-+	endif
++    ifeq ($(SYSTEMCTL_OVERRIDE),true)
++      IS_SYSTEMCTL=true
++    endif
 +  endif
  else
 -  ifeq ("$(wildcard /bin/systemctl)","/usr/bin/systemctl")
@@ -129,7 +128,7 @@ index c37373b..6d2a295 100644
  install: bash_completion
  	python setup.py install --prefix ${DESTDIR}${PREFIX} ${EXTRA_SETUP_OPTS}
  	mkdir -p ${DESTDIR}${PREFIX}/sbin/
-@@ -34,30 +87,57 @@ install: bash_completion
+@@ -34,30 +86,57 @@ install: bash_completion
  	ln -fs ${PYTHON_SITELIB}/pcs/pcs.py ${DESTDIR}${PREFIX}/sbin/pcs
  	install -D pcs/bash_completion.d.pcs ${DESTDIR}/etc/bash_completion.d/pcs
  	install -m644 -D pcs/pcs.8 ${DESTDIR}/${MANDIR}/man8/pcs.8

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