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

Author: sorah

debian/changelog

@@ -1,3 +1,9 @@
+ruby2.3 (2.3.1-5nkmi4) UNRELEASED; urgency=medium
+
+  * Keep rdoc on libruby2.3 package to allow upgrade from stock package
+
+ -- Sorah Fukumori <[email protected]>  Fri, 15 Jul 2016 08:04:14 +0000
+
 ruby2.3 (2.3.1-5nkmi3~xenial) xenial; urgency=medium
 
   * remove rake dep

debian/libruby2.3.install

@@ -2,4 +2,6 @@
 /usr/lib/*/ruby
 /usr/lib/ruby/*.0
 /usr/lib/ruby/vendor_ruby
+/usr/lib/ruby/gems/*.0/gems/rdoc-*
+/usr/lib/ruby/gems/*.0/specifications/default/rdoc-*
 /usr/share/systemtap/tapset/libruby*.stp

debian/ruby2.3-gems.install

@@ -1 +1,18 @@
-/usr/lib/ruby/gems/*
+/usr/lib/ruby/gems/*.0/specifications/default/bigdecimal-*
+/usr/lib/ruby/gems/*.0/specifications/default/io-console-*
+/usr/lib/ruby/gems/*.0/specifications/default/json-*
+/usr/lib/ruby/gems/*.0/specifications/default/psych-*
+/usr/lib/ruby/gems/*.0/specifications/default/rdoc-*
+/usr/lib/ruby/gems/*.0/specifications/power_assert-*
+/usr/lib/ruby/gems/*.0/specifications/test-unit-*
+/usr/lib/ruby/gems/*.0/specifications/minitest-*
+/usr/lib/ruby/gems/*.0/specifications/rake-*
+/usr/lib/ruby/gems/*.0/specifications/net-telnet-*
+/usr/lib/ruby/gems/*.0/specifications/did_you_mean-*
+/usr/lib/ruby/gems/*.0/cache/*
+/usr/lib/ruby/gems/*.0/gems/power_assert-*
+/usr/lib/ruby/gems/*.0/gems/test-unit-*
+/usr/lib/ruby/gems/*.0/gems/minitest-*
+/usr/lib/ruby/gems/*.0/gems/rake-*
+/usr/lib/ruby/gems/*.0/gems/net-telnet-*
+/usr/lib/ruby/gems/*.0/gems/did_you_mean-*