tags 743993 + patch
thanks
Dear maintainer,
I've prepared an NMU for redland-bindings (versioned as 1.0.16.1-2.1). The diff
is attached to this message.
Regards.
diff -Nru redland-bindings-1.0.16.1/debian/changelog
redland-bindings-1.0.16.1/debian/changelog
--- redland-bindings-1.0.16.1/debian/changelog 2014-03-08 06:34:38.000000000
+0100
+++ redland-bindings-1.0.16.1/debian/changelog 2014-04-20 15:54:59.000000000
+0200
@@ -1,3 +1,10 @@
+redland-bindings (1.0.16.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build for Ruby 2.0. (Closes: #743993)
+
+ -- Christian Hofstaedtler <z...@debian.org> Sun, 20 Apr 2014 15:54:31 +0200
+
redland-bindings (1.0.16.1-2) unstable; urgency=medium
* Acknowlege NMU - thanks Christian.
diff -Nru redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch
redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch
--- redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch
1970-01-01 01:00:00.000000000 +0100
+++ redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch
2014-04-20 15:53:58.000000000 +0200
@@ -0,0 +1,56 @@
+diff --git a/configure b/configure
+index 5593952..1c8cc27 100755
+--- a/configure
++++ b/configure
+@@ -12311,7 +12311,7 @@ if test "X$RUBY" != X; then
+ RUBY_ARCHDIR=`$RUBY -rrbconfig -e "print RbConfig::CONFIG['archdir']"`
+ ruby_install_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['$ruby_install_dir_variable']"`
+ ruby_header_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['rubyhdrdir']"`
+- ruby_arch_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['arch']"`
++ ruby_arch_header_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['rubyarchhdrdir']"`
+ ruby_arch_install_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['$ruby_arch_install_dir_variable']"`
+ librubyarg_shared=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['LIBRUBYARG_SHARED']"`
+
+@@ -12342,13 +12342,7 @@ $as_echo "$RUBY_ARCH_INSTALLDIR from RbConfig::CONFIG
$ruby_arch_install_dir_var
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby headers dir" >&5
+ $as_echo_n "checking Ruby headers dir... " >&6; }
+ if test "X$ruby_header_dir_config" != "Xnil" -a "X$ruby_header_dir_config"
!= "X"; then
+- RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_header_dir_config"
+- if test "X$ruby_arch_config" != "Xnil" -a "X$ruby_arch_config" != "X";
then
+- ruby_arch_hdrdir="$ruby_header_dir_config/$ruby_arch_config"
+- if test -d "$ruby_arch_hdrdir"; then
+- RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_arch_hdrdir"
+- fi
+- fi
++ RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_header_dir_config
-I$ruby_arch_header_dir_config"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_INCLUDES from
RbConfig::CONFIG rubyhdrdir" >&5
+ $as_echo "$RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir" >&6; }
+ else
+diff --git a/configure.ac b/configure.ac
+index b285c3b..d9712e1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -364,7 +364,7 @@ if test "X$RUBY" != X; then
+ RUBY_ARCHDIR=`$RUBY -rrbconfig -e "print RbConfig::CONFIG['archdir']"`
+ ruby_install_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['$ruby_install_dir_variable']"`
+ ruby_header_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['rubyhdrdir']"`
+- ruby_arch_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['arch']"`
++ ruby_arch_header_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['rubyarchhdrdir']"`
+ ruby_arch_install_dir_config=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['$ruby_arch_install_dir_variable']"`
+ librubyarg_shared=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG['LIBRUBYARG_SHARED']"`
+ changequote([, ])dnl
+@@ -389,13 +389,7 @@ if test "X$RUBY" != X; then
+
+ AC_MSG_CHECKING(Ruby headers dir)
+ if test "X$ruby_header_dir_config" != "Xnil" -a "X$ruby_header_dir_config"
!= "X"; then
+- RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_header_dir_config"
+- if test "X$ruby_arch_config" != "Xnil" -a "X$ruby_arch_config" != "X";
then
+- ruby_arch_hdrdir="$ruby_header_dir_config/$ruby_arch_config"
+- if test -d "$ruby_arch_hdrdir"; then
+- RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_arch_hdrdir"
+- fi
+- fi
++ RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_header_dir_config
-I$ruby_arch_header_dir_config"
+ AC_MSG_RESULT($RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir)
+ else
+ if test -r "$RUBY_ARCHDIR/ruby.h"; then
diff -Nru redland-bindings-1.0.16.1/debian/patches/series
redland-bindings-1.0.16.1/debian/patches/series
--- redland-bindings-1.0.16.1/debian/patches/series 1970-01-01
01:00:00.000000000 +0100
+++ redland-bindings-1.0.16.1/debian/patches/series 2014-04-20
15:54:13.000000000 +0200
@@ -0,0 +1 @@
+ruby-header-dir.patch
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
