tags 743992 + patch thanks Dear maintainer,
Here is a debdiff to solve this issue. It includes a new patch rubyarchhdrdir.patch to correctly locate arch-specific ruby headers for ruby2.x, and build/depends on ruby instead of ruby1.9.1. Cheers, Cédric
diff -Nru zeroc-ice-3.5.1/debian/changelog zeroc-ice-3.5.1/debian/changelog
--- zeroc-ice-3.5.1/debian/changelog 2014-03-23 15:53:57.000000000 +0100
+++ zeroc-ice-3.5.1/debian/changelog 2014-04-26 02:44:08.000000000 +0200
@@ -1,3 +1,16 @@
+zeroc-ice (3.5.1-5.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build with and depend on the default ruby interpreter (Closes: #743992)
+ - replace all occurences of ruby1.9.1 by ruby, and ruby1.9.1-dev by
+ ruby-dev, in control and rules files.
+ * Add rubyarchhdrdir.patch to correctly find architecture-specific Ruby
+ header for multiarched ruby2.x interpreters
+ * Fix installation path in ruby-zeroc-ice.install to leave space for the
+ architecture name.
+
+ -- Cédric Boutillier <bou...@debian.org> Sat, 26 Apr 2014 02:44:05 +0200
+
zeroc-ice (3.5.1-5.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru zeroc-ice-3.5.1/debian/control zeroc-ice-3.5.1/debian/control
--- zeroc-ice-3.5.1/debian/control 2014-03-23 15:53:07.000000000 +0100
+++ zeroc-ice-3.5.1/debian/control 2014-04-25 22:42:41.000000000 +0200
@@ -15,8 +15,8 @@
python-all-dev (>= 2.3.5-11),
python3-all-dev,
php5-dev (>= 5.4.0~rc6),
- ruby1.9.1-dev,
- ruby1.9.1,
+ ruby-dev,
+ ruby,
libqt4-dev,
Build-Depends-Indep: mono-devel | c-sharp-2.0-compiler,
libmono2.0-cil,
@@ -583,7 +583,7 @@
Package: ruby-zeroc-ice
Architecture: any
Section: ruby
-Depends: ${shlibs:Depends}, ruby1.9.1, ${misc:Depends}
+Depends: ${shlibs:Depends}, ruby, ${misc:Depends}
Replaces: libzeroc-ice-ruby1.8
Breaks: libzeroc-ice-ruby1.8
Provides: libzeroc-ice-ruby1.8
diff -Nru zeroc-ice-3.5.1/debian/patches/rubyarchhdrdir.patch zeroc-ice-3.5.1/debian/patches/rubyarchhdrdir.patch
--- zeroc-ice-3.5.1/debian/patches/rubyarchhdrdir.patch 1970-01-01 01:00:00.000000000 +0100
+++ zeroc-ice-3.5.1/debian/patches/rubyarchhdrdir.patch 2014-04-26 02:33:29.000000000 +0200
@@ -0,0 +1,22 @@
+Description: fix path for arch-specific Ruby headers
+ ruby2.x is multiarched, and the location of arch-specific headers is
+ referenced in RbConfig::CONFIG["rubyarchhdrdir"]
+Author: Cédric Boutillier <bou...@debian.org>
+Last-Update: 2014-04-26
+
+--- a/rb/config/Make.rules
++++ b/rb/config/Make.rules
+@@ -81,9 +82,12 @@
+
+ ifeq ("$(RUBY_MAJOR_VERSION).$(RUBY_MINOR_VERSION)", "1.8")
+ RUBY_FLAGS = -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(archdir)")')
+- else
++ else ifeq ("$(RUBY_MAJOR_VERSION).$(RUBY_MINOR_VERSION)", "1.9")
+ RUBY_FLAGS = -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyhdrdir)")') \
+ -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyhdrdir)/$$(arch)")')
++ else
++ RUBY_FLAGS = -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyhdrdir)")') \
++ -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyarchhdrdir)")')
+ endif
+
+ LIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(libdir)")')
diff -Nru zeroc-ice-3.5.1/debian/patches/series zeroc-ice-3.5.1/debian/patches/series
--- zeroc-ice-3.5.1/debian/patches/series 2013-12-16 21:12:05.000000000 +0100
+++ zeroc-ice-3.5.1/debian/patches/series 2014-04-26 00:30:00.000000000 +0200
@@ -13,3 +13,4 @@
without-test-demo-compilation
iceca
cs-makefile-printf-error
+rubyarchhdrdir.patch
diff -Nru zeroc-ice-3.5.1/debian/ruby-zeroc-ice.install zeroc-ice-3.5.1/debian/ruby-zeroc-ice.install
--- zeroc-ice-3.5.1/debian/ruby-zeroc-ice.install 2013-11-16 13:09:08.000000000 +0100
+++ zeroc-ice-3.5.1/debian/ruby-zeroc-ice.install 2014-04-26 02:37:26.000000000 +0200
@@ -1 +1 @@
-usr/lib/ruby
+usr/lib/*/ruby
diff -Nru zeroc-ice-3.5.1/debian/rules-rb.mk zeroc-ice-3.5.1/debian/rules-rb.mk
--- zeroc-ice-3.5.1/debian/rules-rb.mk 2013-11-16 13:08:49.000000000 +0100
+++ zeroc-ice-3.5.1/debian/rules-rb.mk 2014-04-25 22:42:01.000000000 +0200
@@ -1,17 +1,17 @@
RB_PREFIX=$(CURDIR)/$(DEB_DH_INSTALL_SOURCEDIR)/usr
-RB_RBDIR = $(CURDIR)/$(DEB_DH_INSTALL_SOURCEDIR)$(shell ruby1.9.1 -e \
+RB_RBDIR = $(CURDIR)/$(DEB_DH_INSTALL_SOURCEDIR)$(shell ruby -e \
'require "rbconfig"; puts RbConfig::expand("$$(vendordir)")')
-RB_LIBDIR = $(CURDIR)/$(DEB_DH_INSTALL_SOURCEDIR)$(shell ruby1.9.1 -e \
+RB_LIBDIR = $(CURDIR)/$(DEB_DH_INSTALL_SOURCEDIR)$(shell ruby -e \
'require "rbconfig"; puts RbConfig::expand("$$(vendorarchdir)")')
debian/stamp-build-rb:: debian/stamp-build-cpp
@if test ! -f $@ ; then \
- $(MAKE_INVOKE) RUBY=ruby1.9.1 -C rb all; \
+ $(MAKE_INVOKE) RUBY=ruby -C rb all; \
fi
:> $@
debian/stamp-install-rb:: MAKE_ARGS := \
- RUBY=ruby1.9.1 \
+ RUBY=ruby \
RUBY1.8=no \
prefix=$(RB_PREFIX) \
install_rubydir=$(RB_RBDIR) \
signature.asc
Description: Digital signature
