[Debian-ha-commits] [pcs] 04/10: Refresh patches

Fri Jun 17 11:35:31 UTC 2016

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository pcs.

commit d7247f065fc48c84883c12724262bddb6142ee64
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Jun 17 12:06:58 2016 +0200

    Refresh patches
---
 .../0001-Remove-Gemlock.file-on-Debian.patch       | 21 +++++++--------------
 .../patches/0003-Remove-pcsd-.gitignore-file.patch | 22 ----------------------
 debian/patches/0005-settings.py                    | 12 ++++--------
 debian/patches/0006-Replace-orderedhash.patch      |  6 +++---
 debian/patches/series                              |  1 -
 5 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
index 8f8e6c9..1e81270 100644
--- a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
+++ b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
@@ -17,17 +17,15 @@ deleted file mode 100644
 index 3140d6f..0000000
 --- a/pcsd/Gemfile.lock
 +++ /dev/null
-@@ -1,53 +0,0 @@
+@@ -1,46 +0,0 @@
 -GEM
 -  remote: https://rubygems.org/
 -  remote: https://tojeline.fedorapeople.org/rubygems/
 -  specs:
--    backports (3.6.4)
--    eventmachine (1.0.7)
+-    backports (3.6.8)
+-    eventmachine (1.2.0.1)
 -    json (1.8.3)
--    monkey-lib (0.5.4)
--      backports
--    multi_json (1.11.1)
+-    multi_json (1.12.0)
 -    open4 (1.3.4)
 -    orderedhash (0.0.6)
 -    rack (1.6.4)
@@ -36,21 +34,18 @@ index 3140d6f..0000000
 -    rack-test (0.6.3)
 -      rack (>= 1.0)
 -    rpam-ruby19 (1.2.1)
--    sinatra (1.4.6)
+-    sinatra (1.4.7)
 -      rack (~> 1.4)
 -      rack-protection (~> 1.4)
 -      tilt (>= 1.3, < 3)
--    sinatra-contrib (1.4.4)
+-    sinatra-contrib (1.4.7)
 -      backports (>= 2.0)
 -      multi_json
 -      rack-protection
 -      rack-test
 -      sinatra (~> 1.4.0)
 -      tilt (>= 1.3, < 3)
--    sinatra-sugar (0.5.1)
--      monkey-lib (~> 0.5.0)
--      sinatra (~> 1.0)
--    tilt (1.4.1)
+-    tilt (2.0.3)
 -
 -PLATFORMS
 -  ruby
@@ -59,7 +54,6 @@ index 3140d6f..0000000
 -  backports
 -  eventmachine
 -  json
--  monkey-lib
 -  multi_json
 -  open4
 -  orderedhash
@@ -69,5 +63,4 @@ index 3140d6f..0000000
 -  rpam-ruby19
 -  sinatra
 -  sinatra-contrib
--  sinatra-sugar
 -  tilt
diff --git a/debian/patches/0003-Remove-pcsd-.gitignore-file.patch b/debian/patches/0003-Remove-pcsd-.gitignore-file.patch
deleted file mode 100644
index 6bf65aa..0000000
--- a/debian/patches/0003-Remove-pcsd-.gitignore-file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Tue, 26 Jan 2016 11:34:51 -0500
-Subject: Remove pcsd .gitignore file
-
- - We don't install vcs ignore files in a Debian package, 
-   and do not recommend packing them in release tarballs.
-   
-Change-Id: I81d168e1e851d8d8b1a48fdab5c0af15fa463cf8
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- pcsd/.gitignore | 2 --
- 1 file changed, 2 deletions(-)
- delete mode 100644 pcsd/.gitignore
-
-diff --git a/pcsd/.gitignore b/pcsd/.gitignore
-deleted file mode 100644
-index 180bf07..0000000
---- a/pcsd/.gitignore
-+++ /dev/null
-@@ -1,2 +0,0 @@
--.bundle
--vendor
diff --git a/debian/patches/0005-settings.py b/debian/patches/0005-settings.py
index 3aabdea..fefec13 100644
--- a/debian/patches/0005-settings.py
+++ b/debian/patches/0005-settings.py
@@ -1,9 +1,7 @@
 --- a/pcs/settings.py.debian
 +++ b/pcs/settings.py.debian
-@@ -4,10 +4,10 @@ ccs_binaries = "/usr/sbin/"
- corosync_conf_file = "/etc/corosync/corosync.conf"
- cluster_conf_file = "/etc/cluster/cluster.conf"
- fence_agent_binaries = "/usr/sbin/"
+@@ -1,6 +1,6 @@
+ from pcs.settings_default import *
 -pengine_binary = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/pengine"
 -crmd_binary = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/crmd"
 -cib_binary = "/usr/lib/DEB_HOST_MULTIARCH/pacemaker/cib"
@@ -12,12 +10,10 @@
 +crmd_binary = "/usr/lib/pacemaker/crmd"
 +cib_binary = "/usr/lib/pacemaker/cib"
 +stonithd_binary = "/usr/lib/pacemaker/stonithd"
- pcs_version = "0.9.149"
- crm_report = pacemaker_binaries + "crm_report"
- crm_verify = pacemaker_binaries + "crm_verify"
+ pcsd_exec_location = "/usr/share/pcsd/"
 --- a/pcsd/settings.rb.debian
 +++ b/pcsd/settings.rb.debian
-@@ -9,8 +9,8 @@ OCF_ROOT = "/usr/lib/ocf"
+@@ -9,8 +9,8 @@
  HEARTBEAT_AGENTS_DIR = "/usr/lib/ocf/resource.d/heartbeat/"
  PACEMAKER_AGENTS_DIR = "/usr/lib/ocf/resource.d/pacemaker/"
  NAGIOS_METADATA_DIR = '/usr/share/pacemaker/nagios/plugins-metadata/'
diff --git a/debian/patches/0006-Replace-orderedhash.patch b/debian/patches/0006-Replace-orderedhash.patch
index 9093dab..40d4e8d 100644
--- a/debian/patches/0006-Replace-orderedhash.patch
+++ b/debian/patches/0006-Replace-orderedhash.patch
@@ -7,7 +7,7 @@
  
  require 'cluster.rb'
  require 'permissions.rb'
-@@ -94,15 +94,15 @@
+@@ -124,15 +124,15 @@
    end
  
    def text()
@@ -26,7 +26,7 @@
        c_hash['name'] = c.name
        c_hash['nodes'] = c.nodes.uniq.sort
        out_hash['clusters'] << c_hash
-@@ -190,10 +190,10 @@
+@@ -226,10 +226,10 @@
    end
  
    def text()
@@ -77,7 +77,7 @@
        perm_hash['allow'] = @allow_list.uniq.sort
 --- a/pcsd/Gemfile
 +++ b/pcsd/Gemfile
-@@ -18,4 +18,4 @@
+@@ -16,4 +16,4 @@
  gem 'json'
  gem 'multi_json'
  gem 'open4'
diff --git a/debian/patches/series b/debian/patches/series
index aedca27..160fe45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-Remove-Gemlock.file-on-Debian.patch
 0002-Remove-require-in-pcsd-ssl.rb.patch
-0003-Remove-pcsd-.gitignore-file.patch
 0004-Remove-pcsd-test-.gitignore-file.patch
 0005-settings.py
 0006-Replace-orderedhash.patch

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

