tags 722396 + patch
thanks
Dear maintainer,
I've prepared an NMU for graphviz (versioned as 2.26.3-16.2). The diff
is attached to this message.
As this fixes an RC bug that hasn't seen any activity in weeks, I'm
uploading this right away.
Regards.
diff -Nru graphviz-2.26.3/debian/changelog graphviz-2.26.3/debian/changelog
--- graphviz-2.26.3/debian/changelog 2014-01-12 17:09:27.000000000 +0100
+++ graphviz-2.26.3/debian/changelog 2014-02-12 04:04:10.000000000 +0100
@@ -1,3 +1,10 @@
+graphviz (2.26.3-16.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build Ruby bindings for Ruby 1.9.1. (Closes: #722396)
+
+ -- Christian Hofstaedtler <z...@debian.org> Wed, 12 Feb 2014 04:03:17 +0100
+
graphviz (2.26.3-16.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru graphviz-2.26.3/debian/control graphviz-2.26.3/debian/control
--- graphviz-2.26.3/debian/control 2014-01-12 17:09:27.000000000 +0100
+++ graphviz-2.26.3/debian/control 2014-02-12 04:03:15.000000000 +0100
@@ -27,8 +27,8 @@
ghostscript,
lua5.1,
liblua5.1-0-dev,
- ruby1.8,
- ruby1.8-dev,
+ ruby,
+ ruby-dev,
php5-dev,
php5-cli,
python-all-dev,
@@ -130,13 +130,12 @@
Package: libgv-ruby
Architecture: any
Section: ruby
-Depends: ${shlibs:Depends}, ruby1.8, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Ruby bindings for graphviz
Graphviz is a set of graph drawing tools. See the description of the graphviz
package for a full description.
.
- This package contains the Ruby (1.8) bindings.
-
+ This package contains the Ruby bindings.
Package: libgv-tcl
Architecture: any
diff -Nru graphviz-2.26.3/debian/libgv-ruby.install
graphviz-2.26.3/debian/libgv-ruby.install
--- graphviz-2.26.3/debian/libgv-ruby.install 2014-01-12 17:09:27.000000000
+0100
+++ graphviz-2.26.3/debian/libgv-ruby.install 2014-02-12 03:54:26.000000000
+0100
@@ -1,2 +1,3 @@
usr/lib/graphviz/ruby/libgv_ruby.so
usr/share/man/man3/gv.3ruby
+usr/lib/ruby/*/*/*/gv.so
diff -Nru graphviz-2.26.3/debian/patches/ruby-multiarch
graphviz-2.26.3/debian/patches/ruby-multiarch
--- graphviz-2.26.3/debian/patches/ruby-multiarch 1970-01-01
01:00:00.000000000 +0100
+++ graphviz-2.26.3/debian/patches/ruby-multiarch 2014-02-12
03:38:46.000000000 +0100
@@ -0,0 +1,38 @@
+Description: Make Ruby bindings multiarch aware
+
+Index: graphviz-2.26.3/config/config_ruby.rb
+===================================================================
+--- graphviz-2.26.3.orig/config/config_ruby.rb 2014-02-12 03:38:32.144657757
+0100
++++ graphviz-2.26.3/config/config_ruby.rb 2014-02-12 03:38:44.012572418
+0100
+@@ -5,12 +5,15 @@ CONFIG = Config::MAKEFILE_CONFIG
+
+ case ARGV[0]
+ when "INCLUDES"
+- puts Config::expand(CONFIG["archdir"])
++ dirs = [Config::expand(CONFIG["rubyhdrdir"])]
++ # multiarch before 2.1
++ dirs << Config::expand("$(rubyhdrdir)/$(sitearch)")
++ puts "-I"+dirs.join(" -I")
+ when "lib"
+ puts Config::expand(CONFIG["libdir"])
+ when "archsitelib"
+- puts Config::expand(CONFIG["sitearchdir"])
++ puts Config::expand(CONFIG["vendorarchdir"])
+ when "sitelib"
+- puts Config::expand(CONFIG["sitedir"])
++ puts Config::expand(CONFIG["vendordir"])
+ end
+
+Index: graphviz-2.26.3/configure.ac
+===================================================================
+--- graphviz-2.26.3.orig/configure.ac 2014-02-12 03:38:32.144657757 +0100
++++ graphviz-2.26.3/configure.ac 2014-02-12 03:38:32.140657786 +0100
+@@ -1461,7 +1461,7 @@ else
+ if test "x$RUBY" = "x"; then
+ use_ruby="No (ruby not available)"
+ else
+- RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
++ RUBY_INCLUDES="`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
+ # hack for powerpc-darwin8 (10.4)
+ if test "x$DARWIN" = "xyes"; then
+ RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
diff -Nru graphviz-2.26.3/debian/patches/series
graphviz-2.26.3/debian/patches/series
--- graphviz-2.26.3/debian/patches/series 2014-01-12 17:09:27.000000000
+0100
+++ graphviz-2.26.3/debian/patches/series 2014-02-12 03:21:04.000000000
+0100
@@ -13,10 +13,10 @@
fix-kfreebsd-chroots
fix-hurd-autotools
automake_1.11.2_fixes
-explicit_ruby_1.8
kfreebsd-hang.patch
use-system-ltdl.patch
buffer_overflow.patch
CVE-2014-1235.patch
CVE-2014-1236.patch
fix-missing-format-string.patch
+ruby-multiarch
diff -Nru graphviz-2.26.3/debian/rules graphviz-2.26.3/debian/rules
--- graphviz-2.26.3/debian/rules 2014-01-12 17:09:27.000000000 +0100
+++ graphviz-2.26.3/debian/rules 2014-02-12 03:45:51.000000000 +0100
@@ -33,7 +33,6 @@
PYTHON_VERSIONS = $(shell pyversions -r)
PYTHON_PACKAGE = $(CURDIR)/debian/libgv-python
-RUBY_VERSION = 1.8
RUBY_PACKAGE = $(CURDIR)/debian/libgv-ruby
CONFIG_SCRIPTS=config/config.guess lib/gd/config/config.guess
libltdl/config.guess \
@@ -205,12 +204,6 @@
dh_installman -plibgvc$(SONAME) \
$(CURDIR)/debian/libgvc$(SONAME)-config-update.8
- # Some additional work for libgv-ruby
- install -d $(RUBY_PACKAGE)/usr/lib/ruby/$(RUBY_VERSION)
- mv $(RUBY_PACKAGE)/usr/lib/graphviz/ruby/libgv_ruby.so \
- $(RUBY_PACKAGE)/usr/lib/ruby/$(RUBY_VERSION)/gv.so
- rm -rf $(RUBY_PACKAGE)/usr/lib/graphviz
-
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
