[Debian-ha-commits] [pcs] 04/12: Regenerate patches after new upstream sources imported

[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 5530eea961a46027f081b7ec76b0b462ed6dbcf4
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue Jan 26 11:36:59 2016 -0500

    Regenerate patches after new upstream sources imported
    
     - Some patches no longer required, this includes the
       patches to the makefiles as upstream has included the
       changes we were making via the patches.
     - Remaining patches regenerated to remove fuzz.
    
    Change-Id: Icd60b64424c8a0c13c0f218687064d65555fd58a
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 .../0001-Remove-Gemlock.file-on-Debian.patch       | 73 ++++++++++++++++++++++
 .../0002-Remove-require-in-pcsd-ssl.rb.patch       | 22 +++++++
 .../patches/0003-Remove-pcsd-.gitignore-file.patch | 22 +++++++
 debian/patches/series                              |  3 +
 4 files changed, 120 insertions(+)

diff --git a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
new file mode 100644
index 0000000..8f8e6c9
--- /dev/null
+++ b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
@@ -0,0 +1,73 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Tue, 26 Jan 2016 11:33:31 -0500
+Subject: Remove Gemlock.file on Debian
+
+ - See
+https://wiki.debian.org/Teams/Ruby/Packaging/Tests#Dealing_with_Bundler_usage
+
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+Change-Id: I49a3aaccabe58efad195786006b79526fe8db7f2
+---
+ pcsd/Gemfile.lock | 53 -----------------------------------------------------
+ 1 file changed, 53 deletions(-)
+ delete mode 100644 pcsd/Gemfile.lock
+
+diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
+deleted file mode 100644
+index 3140d6f..0000000
+--- a/pcsd/Gemfile.lock
++++ /dev/null
+@@ -1,53 +0,0 @@
+-GEM
+-  remote: https://rubygems.org/
+-  remote: https://tojeline.fedorapeople.org/rubygems/
+-  specs:
+-    backports (3.6.4)
+-    eventmachine (1.0.7)
+-    json (1.8.3)
+-    monkey-lib (0.5.4)
+-      backports
+-    multi_json (1.11.1)
+-    open4 (1.3.4)
+-    orderedhash (0.0.6)
+-    rack (1.6.4)
+-    rack-protection (1.5.3)
+-      rack
+-    rack-test (0.6.3)
+-      rack (>= 1.0)
+-    rpam-ruby19 (1.2.1)
+-    sinatra (1.4.6)
+-      rack (~> 1.4)
+-      rack-protection (~> 1.4)
+-      tilt (>= 1.3, < 3)
+-    sinatra-contrib (1.4.4)
+-      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)
+-
+-PLATFORMS
+-  ruby
+-
+-DEPENDENCIES
+-  backports
+-  eventmachine
+-  json
+-  monkey-lib
+-  multi_json
+-  open4
+-  orderedhash
+-  rack
+-  rack-protection
+-  rack-test
+-  rpam-ruby19
+-  sinatra
+-  sinatra-contrib
+-  sinatra-sugar
+-  tilt
diff --git a/debian/patches/0002-Remove-require-in-pcsd-ssl.rb.patch b/debian/patches/0002-Remove-require-in-pcsd-ssl.rb.patch
new file mode 100644
index 0000000..74a4e05
--- /dev/null
+++ b/debian/patches/0002-Remove-require-in-pcsd-ssl.rb.patch
@@ -0,0 +1,22 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Tue, 26 Jan 2016 11:34:06 -0500
+Subject: Remove require in pcsd ssl.rb
+
+  - Remove the require on rubygems from /usr/share/pcsd/
+    ssl.rb as dependencies are handled via debian
+
+Change-Id: Idd728e8b6999a3642c0153eb4639817a3741b088
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ pcsd/ssl.rb | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pcsd/ssl.rb b/pcsd/ssl.rb
+index 2858574..15d4821 100644
+--- a/pcsd/ssl.rb
++++ b/pcsd/ssl.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'webrick'
+ require 'webrick/https'
+ require 'openssl'
diff --git a/debian/patches/0003-Remove-pcsd-.gitignore-file.patch b/debian/patches/0003-Remove-pcsd-.gitignore-file.patch
new file mode 100644
index 0000000..6bf65aa
--- /dev/null
+++ b/debian/patches/0003-Remove-pcsd-.gitignore-file.patch
@@ -0,0 +1,22 @@
+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/series b/debian/patches/series
new file mode 100644
index 0000000..3425fa9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Remove-Gemlock.file-on-Debian.patch
+0002-Remove-require-in-pcsd-ssl.rb.patch
+0003-Remove-pcsd-.gitignore-file.patch

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