Control: tags 804799 + pending Dear maintainer,
I've prepared an NMU for graphviz (versioned as 2.38.0-11.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- Antonio Terceiro <terce...@debian.org>
diff -Nru graphviz-2.38.0/debian/changelog graphviz-2.38.0/debian/changelog
--- graphviz-2.38.0/debian/changelog 2015-10-31 14:35:36.000000000 -0200
+++ graphviz-2.38.0/debian/changelog 2015-11-17 11:15:25.000000000 -0200
@@ -1,3 +1,10 @@
+graphviz (2.38.0-11.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with Ruby 2.2 as default (Closes: #804799)
+
+ -- Antonio Terceiro <terce...@debian.org> Tue, 17 Nov 2015 11:15:03 -0200
+
graphviz (2.38.0-11) unstable; urgency=low
* Backport build fix of RedHat for Ruby 2.2 transition (closes: #803587).
diff -Nru graphviz-2.38.0/debian/patches/ruby-2.1.diff graphviz-2.38.0/debian/patches/ruby-2.1.diff
--- graphviz-2.38.0/debian/patches/ruby-2.1.diff 2014-12-10 13:25:41.000000000 -0200
+++ graphviz-2.38.0/debian/patches/ruby-2.1.diff 1969-12-31 21:00:00.000000000 -0300
@@ -1,13 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1566,7 +1566,7 @@ else
- RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
- fi
- ],[
-- PKG_CHECK_MODULES([RUBY], [ruby-1.9],[
-+ PKG_CHECK_MODULES([RUBY], [ruby-2.1],[
- AC_CHECK_PROG(RUBY,ruby,ruby)
- if test "x$RUBY" = "x"; then
- use_ruby="No (ruby not available)"
diff -Nru graphviz-2.38.0/debian/patches/series graphviz-2.38.0/debian/patches/series
--- graphviz-2.38.0/debian/patches/series 2015-10-31 14:13:08.000000000 -0200
+++ graphviz-2.38.0/debian/patches/series 2015-11-11 16:54:30.000000000 -0200
@@ -7,7 +7,7 @@
python_multiarch
tcllib.diff
ruby-config.diff
-ruby-2.1.diff
+use-default-ruby.diff
reduce-lab-color.patch
add-libm-to-dot-link.patch
versioned-plugin-config-file.diff
diff -Nru graphviz-2.38.0/debian/patches/use-default-ruby.diff graphviz-2.38.0/debian/patches/use-default-ruby.diff
--- graphviz-2.38.0/debian/patches/use-default-ruby.diff 1969-12-31 21:00:00.000000000 -0300
+++ graphviz-2.38.0/debian/patches/use-default-ruby.diff 2015-11-11 16:57:58.000000000 -0200
@@ -0,0 +1,13 @@
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1566,7 +1566,7 @@ else
+ RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
+ fi
+ ],[
+- PKG_CHECK_MODULES([RUBY], [ruby-1.9],[
++ PKG_CHECK_MODULES([RUBY], [ruby-$(ruby -e 'puts RUBY_VERSION.split(".").first(2).join(".")')],[
+ AC_CHECK_PROG(RUBY,ruby,ruby)
+ if test "x$RUBY" = "x"; then
+ use_ruby="No (ruby not available)"
signature.asc
Description: PGP signature
