Merge branch 'patches/sorah'

Author: sorah

debian/control

@@ -24,8 +24,6 @@ Build-Depends: autotools-dev,
                ruby | ruby-interpreter | ruby1.8,
                rubygems-integration (>= 1.6),
                systemtap-sdt-dev [linux-any],
-               tcl8.6-dev,
-               tk8.6-dev,
                zlib1g-dev
 Standards-Version: 3.9.8
 Homepage: http://www.ruby-lang.org/
@@ -55,10 +53,7 @@ Section: libs
 Multi-Arch: same
 Architecture: any
 Depends: rake (>= 10.4.2),
-         ruby-did-you-mean (>= 1.0),
-         ruby-minitest (>= 5.4),
-         ruby-net-telnet (>= 0.1.1),
-         ruby-test-unit (>= 3.0.8~),
+         ruby2.3-gems (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Libraries necessary to run Ruby 2.3
@@ -70,6 +65,13 @@ Description: Libraries necessary to run Ruby 2.3
  This package includes the 'libruby-2.3' library, necessary to run Ruby 2.3.
  (API version 2.3.0)
 
+Package: ruby2.3-gems
+Section: libs
+Multi-Arch: same
+Architecture: any
+Depends:  ${misc:Depends}, ${shlibs:Depends}
+Description: Bundled gems
+
 Package: ruby2.3-dev
 Multi-Arch: same
 Architecture: any
@@ -98,16 +100,3 @@ Description: Documentation for Ruby 2.3
  straight-forward, and extensible.
  .
  This package contains the autogenerated documentation for Ruby 2.3.
-
-Package: ruby2.3-tcltk
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: Ruby/Tk for Ruby 2.3
- Ruby is the interpreted scripting language for quick and easy
- object-oriented programming.  It has many features to process text
- files and to do system management tasks (as in perl).  It is simple,
- straight-forward, and extensible.
- .
- This package provides Ruby/Tk, Ruby bindings for the Tk graphical user
- interface toolkit.

debian/libruby2.3.install

@@ -1,4 +1,5 @@
 /usr/lib/*/*.so.*
 /usr/lib/*/ruby
-/usr/lib/ruby
+/usr/lib/ruby/*.0
+/usr/lib/ruby/vendor_ruby
 /usr/share/systemtap/tapset/libruby*.stp

debian/ruby2.3-gems.install

@@ -0,0 +1 @@
+/usr/lib/ruby/gems/*

debian/rules

@@ -40,16 +40,12 @@ configure_options += $(shell dpkg-buildflags --export=configure)
 # Always build with /bin/bash, to get consistent rbconfig.rb (which embeds SHELL).
 export SHELL := /bin/bash
 
-vtcltk=8.6
-configure_options += --with-tcltkversion=$(vtcltk)
-configure_options += --with-tclConfig-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(vtcltk)/tclConfig.sh
-configure_options += --with-tkConfig-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(vtcltk)/tkConfig.sh
-configure_options += --with-tcllib=tcl$(vtcltk)
-configure_options += --with-tklib=tk$(vtcltk)
-configure_options += --with-tcl-include=/usr/include/tcl$(vtcltk)
-configure_options += --with-tk-include=/usr/include/tcl$(vtcltk)
-configure_options += --with-tcl-lib=/usr/lib/$(DEB_HOST_MULTIARCH)
-configure_options += --with-tk-lib=/usr/lib/$(DEB_HOST_MULTIARCH)
+configure_options += --with-out-ext=tcl
+configure_options += --with-out-ext=tk
+
+# for TestExtLibs
+configure_options += --with-out-ext=win32ole
+configure_options += --with-out-ext=win32api
 
 %:
 	dh $@ --parallel --with autotools-dev --with autoreconf
@@ -69,12 +65,11 @@ override_dh_auto_build-arch:
 	dh_auto_build -- main V=1
 
 override_dh_auto_test-arch:
-	$(MAKE) check V=1
+	$(MAKE) TESTS="-v -j 4" V=1 check
 
 override_dh_auto_install-arch:
+	$(MAKE) update-gems extract-gems
 	$(MAKE) install-nodoc V=1 DESTDIR=$(CURDIR)/debian/tmp
-	# remove RPATH from tcltklib bindings
-	chrpath --delete $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ruby/$(RUBY_API_VERSION)/tcltklib.so
 	# handle embedded copy of jquery
 	$(RM) $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBY_API_VERSION)/rdoc/generator/template/darkfish/js/jquery.js
 	dh_link -plibruby$(RUBY_VERSION) /usr/share/javascript/jquery/jquery.min.js /usr/lib/ruby/$(RUBY_API_VERSION)/rdoc/generator/template/darkfish/js/jquery.js
@@ -105,8 +100,6 @@ override_dh_install-arch:
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/systemtap/tapset
 	sed 's|@LIBRARY_PATH@|/usr/lib/$(DEB_HOST_MULTIARCH)/libruby-$(RUBY_VERSION).so|g' $(CURDIR)/debian/libruby.stp > $(CURDIR)/debian/tmp/usr/share/systemtap/tapset/libruby$(RUBY_VERSION)-$(DEB_HOST_MULTIARCH).stp
 	dh_install
-	# split Ruby/Tk files
-	$(baseruby) debian/split-tk-out.rb
 
 import-orig-source:
 	test -d .git