[SCM] sonic-pi/master: don't load did_you_mean on Debian with ruby < 2.3.0

[hanno-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ca582c210c4691e4feb5554783fa406f1667994e
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date:   Fri Feb 26 15:55:50 2016 +0100

    don't load did_you_mean on Debian with ruby < 2.3.0

diff --git a/debian/patches/05-use-debian-gems.patch b/debian/patches/05-use-debian-gems.patch
index dfba5a2..768467e 100644
--- a/debian/patches/05-use-debian-gems.patch
+++ b/debian/patches/05-use-debian-gems.patch
@@ -11,11 +11,11 @@ Forwarded: no
 Author: Hanno Zulla <kontakt at hanno.de>
 Last-Update: 2016-01-22
 
-Index: pkg-sonic-pi.work2/app/server/core.rb
+Index: sonic-pi/app/server/core.rb
 ===================================================================
---- pkg-sonic-pi.work2.orig/app/server/core.rb	2016-01-22 16:01:51.000000000 +0100
-+++ pkg-sonic-pi.work2/app/server/core.rb	2016-01-22 16:01:51.000000000 +0100
-@@ -14,32 +14,6 @@
+--- sonic-pi.orig/app/server/core.rb	2016-02-26 15:53:36.410295019 +0100
++++ sonic-pi/app/server/core.rb	2016-02-26 15:54:38.632757162 +0100
+@@ -14,34 +14,8 @@
  
  raise "Sonic Pi requires Ruby 1.9.3+ to be installed. You are using version #{RUBY_VERSION}" if RUBY_VERSION < "1.9.3"
  
@@ -46,5 +46,8 @@ Index: pkg-sonic-pi.work2/app/server/core.rb
 -end
 -
  begin
-   require 'did_you_mean'
+-  require 'did_you_mean'
++  require 'did_you_mean' if RUBY_VERSION >= "2.3.0"
  rescue LoadError
+   warn "Non-critical error: Could not load did_you_mean"
+ end

-- 
sonic-pi packaging