From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 13 Mar 2014 17:32:58 +0000 (+0100)
Subject: Passenger is not use to be in gem list.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=763ffb23341a88720820f4614ca74ea06f77ecd4;p=rOCCI-packaging.git

Passenger is not use to be in gem list.
---

diff --git a/rocci-server/debian/patches/unbundle-all.patch b/rocci-server/debian/patches/unbundle-all.patch
index 50cdf01..2d727bf 100644
--- a/rocci-server/debian/patches/unbundle-all.patch
+++ b/rocci-server/debian/patches/unbundle-all.patch
@@ -1,14 +1,24 @@
-commit f3215df48f03308792295a406abc8a819ac1fc6b
+commit b7946a7755d6f24511865275a4030683494b91ec
 Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Thu Mar 13 18:00:00 2014 +0100
+Date:   Thu Mar 13 18:31:34 2014 +0100
 
     All gems from the system, no git references in Gemfiles, disable :development and :test.
 
 diff --git a/Gemfile b/Gemfile
-index 94a3593..b6553f7 100644
+index 94a3593..7d2b2f4 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -75,7 +75,7 @@ gem 'kgio'
+@@ -25,9 +25,6 @@ gem 'debugger', group: [:development, :test]
+ # Use whenever for scheduled jobs
+ gem 'whenever', require: false
+ 
+-# Use passenger for deployment (standalone or in Apache2)
+-gem 'passenger', '= 4.0.29'
+-
+ # Use simplecov for coverage reports
+ gem 'simplecov', group: [:development, :test]
+ 
+@@ -75,7 +72,7 @@ gem 'kgio'
  gem 'warden'
  
  # Sensible logging with LogStash support
@@ -18,10 +28,10 @@ index 94a3593..b6553f7 100644
  # Use Hashie::Mash to simplify hash-related stuff
  gem 'hashie'
 diff --git a/Gemfile.lock b/Gemfile.lock
-index 3a6dbbd..6e42b08 100644
+index 3a6dbbd..e7d0317 100644
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -1,294 +1,23 @@
+@@ -1,294 +1,21 @@
 -GIT
 -  remote: git://github.com/arax/logstasher.git
 -  revision: 4ceebbb27b647d7f15776afba4893684c575ce72
@@ -302,18 +312,18 @@ index 3a6dbbd..6e42b08 100644
 -  openssl_cms_1_9_3!
 -  openssl_cms_2_0_0!
 -  openssl_cms_2_1!
-+  openssl_cms_1_9_3
-   passenger (= 4.0.29)
+-  passenger (= 4.0.29)
 -  pry-rails
 -  pry-rescue
 -  pry-stack_explorer
++  openssl_cms_1_9_3
    rails (~> 4.0.0)
    rails-api (~> 0.2.0)
 -  rb-inotify
 -  redcarpet
 -  rspec-rails
 -  rvm-capistrano
-   sdoc
+-  sdoc
 -  simplecov
    warden
    whenever