[Debian-ha-commits] [pcs] 01/03: Dropped patch 0005 in preparation of do-over

[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 d6cf9ac9aa55d87bc7b8b6c65eda06069655b1c0
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue May 5 20:36:43 2015 -0400

    Dropped patch 0005 in preparation of do-over
    
    Change-Id: Ic5321b8c3f156b592dd663412e947c3d0ef7fe7a
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 .../0005-Fix-file-locations-in-pcsd.service.patch  | 29 ----------------------
 ...Fix-pcsd.service-destination-in-Makefile.patch} |  0
 ...006-Change-pcsd-destination-to-usr-share.patch} |  0
 ...> 0007-Fix-check-for-systemctl-on-Debian.patch} |  0
 ...Do-not-install-upstream-pcsd-init-script.patch} |  0
 ...0009-Remove-rubygems-require-pcsd-ssl.rb.patch} |  0
 debian/patches/series                              | 11 ++++----
 7 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/debian/patches/0005-Fix-file-locations-in-pcsd.service.patch b/debian/patches/0005-Fix-file-locations-in-pcsd.service.patch
deleted file mode 100644
index b92d6be..0000000
--- a/debian/patches/0005-Fix-file-locations-in-pcsd.service.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/0006-Fix-pcsd.service-destination-in-Makefile.patch b/debian/patches/0005-Fix-pcsd.service-destination-in-Makefile.patch
similarity index 100%
rename from debian/patches/0006-Fix-pcsd.service-destination-in-Makefile.patch
rename to debian/patches/0005-Fix-pcsd.service-destination-in-Makefile.patch
diff --git a/debian/patches/0007-Change-pcsd-destination-to-usr-share.patch b/debian/patches/0006-Change-pcsd-destination-to-usr-share.patch
similarity index 100%
rename from debian/patches/0007-Change-pcsd-destination-to-usr-share.patch
rename to debian/patches/0006-Change-pcsd-destination-to-usr-share.patch
diff --git a/debian/patches/0008-Fix-check-for-systemctl-on-Debian.patch b/debian/patches/0007-Fix-check-for-systemctl-on-Debian.patch
similarity index 100%
rename from debian/patches/0008-Fix-check-for-systemctl-on-Debian.patch
rename to debian/patches/0007-Fix-check-for-systemctl-on-Debian.patch
diff --git a/debian/patches/0009-Do-not-install-upstream-pcsd-init-script.patch b/debian/patches/0008-Do-not-install-upstream-pcsd-init-script.patch
similarity index 100%
rename from debian/patches/0009-Do-not-install-upstream-pcsd-init-script.patch
rename to debian/patches/0008-Do-not-install-upstream-pcsd-init-script.patch
diff --git a/debian/patches/0010-Remove-rubygems-require-pcsd-ssl.rb.patch b/debian/patches/0009-Remove-rubygems-require-pcsd-ssl.rb.patch
similarity index 100%
rename from debian/patches/0010-Remove-rubygems-require-pcsd-ssl.rb.patch
rename to debian/patches/0009-Remove-rubygems-require-pcsd-ssl.rb.patch
diff --git a/debian/patches/series b/debian/patches/series
index 0a1b25f..ea0fbc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,9 +2,8 @@
 0002-Remove-Gemfile.lock-for-debian.patch
 0003-Remove-build_gems-from-install_pcsd.patch
 0004-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
-0005-Fix-file-locations-in-pcsd.service.patch
-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
-0010-Remove-rubygems-require-pcsd-ssl.rb.patch
+0005-Fix-pcsd.service-destination-in-Makefile.patch
+0006-Change-pcsd-destination-to-usr-share.patch
+0007-Fix-check-for-systemctl-on-Debian.patch
+0008-Do-not-install-upstream-pcsd-init-script.patch
+0009-Remove-rubygems-require-pcsd-ssl.rb.patch

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