Merge branch 'master-2.3' into dist/2.3/trusty

Author: sorah

debian/changelog

@@ -1,3 +1,10 @@
+ruby2.3 (2.3.1-5nkmi3) UNRELEASED; urgency=medium
+
+  * remove rake dep
+  * fix typo (couldn't build on xenial)
+
+ -- Sorah Fukumori <[email protected]>  Tue, 12 Jul 2016 12:41:45 +0000
+
 ruby2.3 (2.3.1-5nkmi2~trusty) trusty; urgency=medium
 
   * Backported trunk tool/downloader.rb to build on trusty
@@ -6,7 +13,6 @@ ruby2.3 (2.3.1-5nkmi2~trusty) trusty; urgency=medium
  -- Sorah Fukumori <[email protected]>  Tue, 12 Jul 2016 17:09:19 +0000
 
 ruby2.3 (2.3.1-5nkmi1~trusty) trusty; urgency=medium
-
   * init from sorah (nkmi)
   * remove tcltk
   * ruby2.3-gems package for bundled gems

debian/rules

@@ -17,7 +17,7 @@ export RUBY_VERSION       := $(patsubst ruby%,%,$(SOURCE))
 export RUBY_API_VERSION   := $(RUBY_VERSION).0
 
 # Gem::Security is required, so use ruby 2.0 or later
-baseruby=$(shell test -x /usr/bin/ruby && ruby -rgem/security -e0 2>/dev/null && echo /usr/bin/ruby || echo /usr/bin/ruby2.0)
+baseruby=$(shell test -x /usr/bin/ruby && ruby -rrubygems/security -e0 2>/dev/null && echo /usr/bin/ruby || echo /usr/bin/ruby2.0)
 
 configure_options += --enable-multiarch
 configure_options += --target=$(DEB_HOST_MULTIARCH)