Bug#681437: unblock: graphviz/2.26.3-12
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package graphviz
Testing contains version 2.26.3-10 of graphviz which currently FTBFS
due to removal of python 2.5 and change to ruby to 1.9 by default.
The previous 2.26.3-11 version fixed RC bug #669517 by removing a reference
to python 2.5. However RC bug #676098 was raised before this could transit
to testing.
Version 2.26.3-12 fixes bug #676098 by explicitly referring to ruby 1.8 in
both debian/control and configure.ac.
debdiffs for both versions below:
-------- debdiff between 2.26.3-10 and 2.26.3-11 --------
diff -Nru graphviz-2.26.3/debian/changelog graphviz-2.26.3/debian/changelog
--- graphviz-2.26.3/debian/changelog 2012-03-14 23:18:03.000000000 +0000
+++ graphviz-2.26.3/debian/changelog 2012-05-02 21:56:03.000000000 +0100
@@ -1,3 +1,10 @@
+graphviz (2.26.3-11) unstable; urgency=low
+
+ * Remove reference to python 2.5 which is no longer available in sid
+ (Closes: #669517)
+
+ -- David Claughton <dave@eclecticdave.com> Wed, 02 May 2012 21:53:08 +0100
+
graphviz (2.26.3-10) unstable; urgency=low
* Fixes for compatibility with Automake 1.11.2 (Closes: #661909)
diff -Nru graphviz-2.26.3/debian/libgv-python.install graphviz-2.26.3/debian/libgv-python.install
--- graphviz-2.26.3/debian/libgv-python.install 2011-05-18 20:41:03.000000000 +0100
+++ graphviz-2.26.3/debian/libgv-python.install 2012-05-02 21:56:03.000000000 +0100
@@ -1,5 +1,4 @@
usr/lib/graphviz/python
-usr/lib/graphviz/python25
usr/lib/graphviz/python26
usr/lib/graphviz/python27
usr/share/man/man3/gv.3python
-------- debdiff between 2.26.3-11 and 2.26.3-12 --------
diff -Nru graphviz-2.26.3/debian/changelog graphviz-2.26.3/debian/changelog
--- graphviz-2.26.3/debian/changelog 2012-05-02 21:56:03.000000000 +0100
+++ graphviz-2.26.3/debian/changelog 2012-07-10 23:37:19.000000000 +0100
@@ -1,3 +1,11 @@
+graphviz (2.26.3-12) unstable; urgency=low
+
+ * Fixes to explicitly use ruby 1.8 as default for ruby is now 1.9
+ (Graphviz doesn't currently support ruby 1.9)
+ (Closes: #676098)
+
+ -- David Claughton <dave@eclecticdave.com> Tue, 10 Jul 2012 21:41:24 +0100
+
graphviz (2.26.3-11) unstable; urgency=low
* Remove reference to python 2.5 which is no longer available in sid
diff -Nru graphviz-2.26.3/debian/control graphviz-2.26.3/debian/control
--- graphviz-2.26.3/debian/control 2012-05-02 21:56:03.000000000 +0100
+++ graphviz-2.26.3/debian/control 2012-07-10 23:37:19.000000000 +0100
@@ -27,7 +27,7 @@
ghostscript,
lua5.1,
liblua5.1-0-dev,
- ruby,
+ ruby1.8,
ruby1.8-dev,
php5-dev,
php5-cli,
diff -Nru graphviz-2.26.3/debian/patches/explicit_ruby_1.8 graphviz-2.26.3/debian/patches/explicit_ruby_1.8
--- graphviz-2.26.3/debian/patches/explicit_ruby_1.8 1970-01-01 01:00:00.000000000 +0100
+++ graphviz-2.26.3/debian/patches/explicit_ruby_1.8 2012-07-10 23:37:19.000000000 +0100
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index cacafe1..36c34b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1400,7 +1400,7 @@ else
+ if test `$SWIG -help 2>&1 | $GREP -c '\-ruby *- Generate'` = 0; then
+ use_ruby="No (swig does not support -ruby option)"
+ else
+- AC_CHECK_PROG(RUBY,ruby,ruby)
++ AC_CHECK_PROG(RUBY,ruby1.8,ruby1.8)
+ if test "x$RUBY" = "x"; then
+ use_ruby="No (ruby not available)"
+ else
diff -Nru graphviz-2.26.3/debian/patches/series graphviz-2.26.3/debian/patches/series
--- graphviz-2.26.3/debian/patches/series 2012-05-02 21:56:03.000000000 +0100
+++ graphviz-2.26.3/debian/patches/series 2012-07-10 23:37:19.000000000 +0100
@@ -13,3 +13,4 @@
fix-kfreebsd-chroots
fix-hurd-autotools
automake_1.11.2_fixes
+explicit_ruby_1.8
unblock graphviz/2.26.3-12
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.38-2-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Reply to: