[DRE-commits] [diaspora] 48/257: refresh boot.rb patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit de0210dbfa9463a828116b5998a0599a9e87e236
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 14 20:52:52 2014 +0530

    refresh boot.rb patch
---
 debian/patches/add-manual-requires-skip-bundler-setup.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/patches/add-manual-requires-skip-bundler-setup.patch b/debian/patches/add-manual-requires-skip-bundler-setup.patch
index 5cbec97..c237d7b 100644
--- a/debian/patches/add-manual-requires-skip-bundler-setup.patch
+++ b/debian/patches/add-manual-requires-skip-bundler-setup.patch
@@ -1,9 +1,10 @@
---- a/config/boot.rb
-+++ b/config/boot.rb
-@@ -1,11 +1,148 @@
--require 'rubygems'
+Index: diaspora/config/boot.rb
+===================================================================
+--- diaspora.orig/config/boot.rb
++++ diaspora/config/boot.rb
+@@ -1,9 +1,148 @@
 +#require 'rubygems'
- 
++
  # Set up gems listed in the Gemfile.
 -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git