Control: tags 805674 + patch
Control: tags 805674 + pending
Dear maintainer,
I've prepared an NMU for ohcount (versioned as 3.0.0-8.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru ohcount-3.0.0/debian/changelog ohcount-3.0.0/debian/changelog
--- ohcount-3.0.0/debian/changelog 2014-01-16 16:26:45.000000000 +0100
+++ ohcount-3.0.0/debian/changelog 2016-03-01 22:03:36.000000000 +0100
@@ -1,3 +1,11 @@
+ohcount (3.0.0-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build system being broken by removal of deprecated "Config"
+ object in Ruby 2.2. (Closes: #805674)
+
+ -- Christian Hofstaedtler <z...@debian.org> Tue, 01 Mar 2016 22:02:31 +0100
+
ohcount (3.0.0-8) unstable; urgency=low
* Remove the explicit dependency on ruby 1.8
diff -Nru ohcount-3.0.0/debian/patches/rbconfig.patch
ohcount-3.0.0/debian/patches/rbconfig.patch
--- ohcount-3.0.0/debian/patches/rbconfig.patch 1970-01-01 01:00:00.000000000
+0100
+++ ohcount-3.0.0/debian/patches/rbconfig.patch 2016-03-01 22:00:01.000000000
+0100
@@ -0,0 +1,28 @@
+Index: ohcount-3.0.0/build
+===================================================================
+--- ohcount-3.0.0.orig/build
++++ ohcount-3.0.0/build
+@@ -114,12 +114,12 @@ run_test_suite()
+
+ build_ruby_bindings()
+ {
+- arch=`ruby -rmkmf -e 'print Config::expand(CONFIG["arch"])'`
++ arch=`ruby -rmkmf -e 'print RbConfig::expand(RbConfig::CONFIG["arch"])'`
+ echo "Generating Ruby bindings for $arch"
+ sh -c "swig -ruby -o ruby/ohcount_wrap.c ruby/ohcount.i" || exit 1
+ mkdir -p ruby/$arch
+ sh -c "$cc $RB_SHARED ruby/ohcount_wrap.c $files -o
ruby/$arch/$RB_SHARED_NAME \
+- -I`ruby -rmkmf -e 'print Config::expand(CONFIG["archdir"])'` \
++ -I`ruby -rmkmf -e 'print RbConfig::expand(RbConfig::CONFIG["archdir"])'` \
+ -lpcre" || exit 1
+ sh -c "cd test/unit/ruby && ruby ruby_test.rb" || exit 1
+ }
+@@ -156,7 +156,7 @@ then
+ rm -f src/hash/*.c
+ rm -f src/$SHARED_NAME
+ rm -f ruby/$RB_SHARED_NAME
+- rm -rf ruby/`ruby -rmkmf -e 'print Config::expand(CONFIG["arch"])'`/*
++ rm -rf ruby/`ruby -rmkmf -e 'print
RbConfig::expand(RbConfig::CONFIG["arch"])'`/*
+ else
+ echo "Usage: build [all|ohcount|shared|tests|ruby|clean]"
+ fi
diff -Nru ohcount-3.0.0/debian/patches/series
ohcount-3.0.0/debian/patches/series
--- ohcount-3.0.0/debian/patches/series 2014-01-16 19:21:49.000000000 +0100
+++ ohcount-3.0.0/debian/patches/series 2016-03-01 21:59:13.000000000 +0100
@@ -2,3 +2,4 @@
fix_null_dereference.patch
txx_support.patch
disabled_test_suite.patch
+rbconfig.patch
--
,''`. Christian Hofstaedtler <z...@debian.org>
: :' : Debian Developer
`. `' 7D1A CFFA D9E0 806C 9C4C D392 5C13 D6DB 9305 2E03
`-
