[Debian-ha-commits] [pcs] 01/01: Updated Patch 0001 in order to remove redundant 'else' in Makefile

[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 930c5a784390f5cc9a2d5279d6d1e711763b8fc2
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu May 7 15:09:58 2015 -0400

    Updated Patch 0001 in order to remove redundant 'else' in Makefile
    
    Change-Id: I2bb01008fecebc21f3c6e55ae108442adbe41034
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...-Streamline-upstream-for-compatibility-with-Debian.patch | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 fef876b..ba7c30e 100644
--- a/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
+++ b/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
@@ -16,8 +16,8 @@ Summary of Changes for Debian:
    configuration, pcsd.pam.debian, is added
  - Debian specific systemd file, pcsd.service.debian, is added
  - Debian specific init; pcsd.debian is added
- - Variables are introduced which discretely eases packaging 
-   for systemd; BUILD_GEMS and systemddir
+ - Variables are introduced which discretely eases packaging;
+   BUILD_GEMS, systemddir, and install_settings
  - pcs/settings.py has variants for multi-arch support with 
    64-bit and 32-bit architectures, updated to know the 
    proper location of pacemaker binaries depending on the 
@@ -26,13 +26,13 @@ Summary of Changes for Debian:
 Change-Id: Ie06f5ed5232fbf00881f7c4a45c00a7822645d4c
 Signed-off-by: Richard B Winters <rik at mmogp.com>
 ---
- Makefile                                |  95 ++++++++++++++++++---
+ Makefile                                |  94 ++++++++++++++++++---
  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, 278 insertions(+), 10 deletions(-)
+ 6 files changed, 277 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..ccf1202 100644
+index c37373b..bcc2066 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,3 +1,21 @@
@@ -123,7 +123,7 @@ index c37373b..ccf1202 100644
  install: bash_completion
  	python setup.py install --prefix ${DESTDIR}${PREFIX} ${EXTRA_SETUP_OPTS}
  	mkdir -p ${DESTDIR}${PREFIX}/sbin/
-@@ -34,30 +81,58 @@ install: bash_completion
+@@ -34,30 +81,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
@@ -131,7 +131,6 @@ index c37373b..ccf1202 100644
 +  ifeq ($(install_settings),true)
 +	rm -f  ${DESTDIR}${PYTHON_SITELIB}/pcs/settings.py
 +	install -m755 pcs/${settings_file} ${DESTDIR}${PYTHON_SITELIB}/pcs/settings.py
-+  else
 +  endif
 +endif
 +	

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