[Debian-ha-commits] [pcs] 07/09: Dropped patches 0011 and 0012 in order to redo them
Richard Winters
devrik-guest at moszumanska.debian.org
Mon May 4 19:55:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository pcs.
commit 94442293d18bd8e9020143bcafc79b3e269f4fcd
Author: Richard B Winters <rik at mmogp.com>
Date: Sun May 3 23:56:41 2015 -0400
Dropped patches 0011 and 0012 in order to redo them
Change-Id: Ifcb7944d44ed686fe31cf860ebb384a867f331b0
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
.../0001-Fix-pcsd-makefile-for-gnu-linux.patch | 2 -
.../0002-Remove-Gemfile.lock-for-debian.patch | 3 --
.../0003-Remove-build_gems-from-install_pcsd.patch | 4 +-
.../patches/0004-Source-lsb-init-functions.patch | 2 -
...e-rc.d-source-functions-in-pcsd-init-file.patch | 2 -
...Fix-pcsd-location-and-args-in-init-script.patch | 4 +-
...ix-pcsd.conf-destination-in-pcsd-makefile.patch | 4 +-
.../0008-Fix-conf-directory-in-pcsd-init.patch | 4 +-
.../0009-Fix-file-locations-in-pcsd.service.patch | 2 -
...-Fix-pcsd.service-destination-in-Makefile.patch | 4 +-
...0011-Change-pcsd-destination-to-usr-share.patch | 39 ---------------
.../0012-Fix-check-for-systemctl-on-Debian.patch | 58 ----------------------
debian/patches/series | 2 -
13 files changed, 5 insertions(+), 125 deletions(-)
diff --git a/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch b/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
index 32214a1..720c629 100644
--- a/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
+++ b/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
@@ -12,8 +12,6 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/pcsd/Makefile b/pcsd/Makefile
-index 325f54a..8779671 100644
--- a/pcsd/Makefile
+++ b/pcsd/Makefile
@@ -1,9 +1,9 @@
diff --git a/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch b/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
index 07fe77d..f169671 100644
--- a/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
+++ b/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
@@ -12,9 +12,6 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
1 file changed, 50 deletions(-)
delete mode 100644 pcsd/Gemfile.lock
-diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
-deleted file mode 100644
-index 06db6d6..0000000
--- a/pcsd/Gemfile.lock
+++ /dev/null
@@ -1,50 +0,0 @@
diff --git a/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch b/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
index c4479ad..86b1c10 100644
--- a/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
+++ b/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
@@ -11,11 +11,9 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
Makefile | 1 -
1 file changed, 1 deletion(-)
-diff --git a/Makefile b/Makefile
-index c37373b..0bc1767 100644
--- a/Makefile
+++ b/Makefile
-@@ -36,7 +36,6 @@ install: bash_completion
+@@ -36,7 +36,6 @@
install -m644 -D pcs/pcs.8 ${DESTDIR}/${MANDIR}/man8/pcs.8
install_pcsd:
diff --git a/debian/patches/0004-Source-lsb-init-functions.patch b/debian/patches/0004-Source-lsb-init-functions.patch
index 19709f5..d68e742 100644
--- a/debian/patches/0004-Source-lsb-init-functions.patch
+++ b/debian/patches/0004-Source-lsb-init-functions.patch
@@ -13,8 +13,6 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/pcsd/pcsd b/pcsd/pcsd
-index b47472a..29bacc3 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -20,6 +20,9 @@
diff --git a/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch b/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
index e69c0d8..0797809 100644
--- a/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
+++ b/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
@@ -10,8 +10,6 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/pcsd/pcsd b/pcsd/pcsd
-index 29bacc3..b2c385d 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -18,7 +18,7 @@
diff --git a/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch b/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
index 5d8118c..33ce23d 100644
--- a/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
+++ b/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
@@ -10,8 +10,6 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/pcsd/pcsd b/pcsd/pcsd
-index b2c385d..226447a 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -7,8 +7,8 @@
@@ -34,7 +32,7 @@ index b2c385d..226447a 100755
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-@@ -34,9 +34,9 @@ lockfile=/var/lock/subsys/$prog
+@@ -34,9 +34,9 @@
start() {
[ -x $exec ] || exit 5
echo -n $"Starting $prog: "
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 536b53c..5394488 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
@@ -11,11 +11,9 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Makefile b/Makefile
-index 0bc1767..6cf519b 100644
--- a/Makefile
+++ b/Makefile
-@@ -39,7 +39,7 @@ install_pcsd:
+@@ -39,7 +39,7 @@
mkdir -p ${DESTDIR}/var/log/pcsd
mkdir -p ${DESTDIR}${PREFIX}/lib/
cp -r pcsd ${DESTDIR}${PREFIX}/lib/
diff --git a/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch b/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
index 9a2a2f4..3a644a2 100644
--- a/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
+++ b/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
@@ -11,8 +11,6 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/pcsd/pcsd b/pcsd/pcsd
-index 226447a..64a35da 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -25,9 +25,10 @@
@@ -27,7 +25,7 @@ index 226447a..64a35da 100755
lockfile=/var/lock/subsys/$prog
-@@ -36,7 +37,7 @@ start() {
+@@ -36,7 +37,7 @@
echo -n $"Starting $prog: "
#export GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby
cd /var/lib/pcsd
diff --git a/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch b/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
index b92d6be..6f4550f 100644
--- a/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
+++ b/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
@@ -11,8 +11,6 @@ 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 @@
diff --git a/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch b/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
index f0b1441..4e8fcb2 100644
--- a/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
+++ b/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
@@ -11,11 +11,9 @@ 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:
+@@ -45,8 +45,8 @@
install -m 700 -d ${DESTDIR}/var/lib/pcsd
install -m 644 -D pcsd/pcsd.logrotate ${DESTDIR}/etc/logrotate.d/pcsd
ifeq ($(IS_SYSTEMCTL),true)
diff --git a/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch b/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
deleted file mode 100644
index a7e1a14..0000000
--- a/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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.
- - Uninstall updated as well
-
-Change-Id: Iffb2e1bc8f1119dbc3181c1ffedd70fc57276a5f
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f67a9b8..c8f2c89 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
-@@ -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
deleted file mode 100644
index ec63b4e..0000000
--- a/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Sun, 3 May 2015 23:44:43 -0400
-Subject: Fix check for systemctl on Debian
-
- - 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: I0503b872f5b27dd119f7c5cb106fb53e0d566fdb
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 17 ++++-------------
- 1 file changed, 4 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c8f2c89..b85e236 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,14 +8,7 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
- EXTRA_SETUP_OPTS="--install-layout=deb"
- endif
-
--IS_SYSTEMCTL=false
--ifeq ("$(wildcard /usr/bin/systemctl)","/usr/bin/systemctl")
-- IS_SYSTEMCTL=true
--else
-- ifeq ("$(wildcard /bin/systemctl)","/usr/bin/systemctl")
-- IS_SYSTEMCTL=true
-- endif
--endif
-+IS_SYSTEMCTL = $(shell if ps -p 1 -o comm= | grep -q -i "systemd" ; then echo true; else echo false; fi)
-
- MANDIR=/usr/share/man
-
-@@ -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/
--else
-- install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
- endif
-+ install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
-
- 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
-
diff --git a/debian/patches/series b/debian/patches/series
index 743a1c8..baefeff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,3 @@
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
-0012-Fix-check-for-systemctl-on-Debian.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list