This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository geos.
commit 4d5eb7cd256209a9cfff2268857510645462cd2d Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Feb 16 21:52:22 2014 +0100 Also patch Makefile.am and macros/ruby.m4 for Ruby extension. --- debian/changelog | 1 + debian/patches/libruby | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index ec5d107..c5bad72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ geos (3.4.2-2) UNRELEASED; urgency=low * Rename libgeos-ruby1.8 to ruby-geos, according to Ruby packaging policy. * Use minimal dh rules with autoreconf for retooling. (closes: #733585) + * Also patch Makefile.am and macros/ruby.m4 for Ruby extension. -- Bas Couwenberg <sebas...@xs4all.nl> Sun, 16 Feb 2014 20:11:38 +0100 diff --git a/debian/patches/libruby b/debian/patches/libruby index 37b0abd..0a6a39f 100644 --- a/debian/patches/libruby +++ b/debian/patches/libruby @@ -1,3 +1,14 @@ +--- a/swig/ruby/Makefile.am ++++ b/swig/ruby/Makefile.am +@@ -22,7 +22,7 @@ INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUB + # Build Ruby module as shared library + rubyextensiondir_LTLIBRARIES = geos.la + geos_la_SOURCES = geos_wrap.cxx +-geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME) ++geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME) + + # Only need to grab the capi header files + geos_la_CPPFLAGS = -I$(top_builddir)/capi --- a/swig/ruby/Makefile.in +++ b/swig/ruby/Makefile.in @@ -334,7 +334,7 @@ MAINTAINERCLEANFILES = geos_wrap.cxx @@ -20,3 +31,14 @@ RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_SO"] || Config::CONFIG["RUBY_SO_NAME"]'` +--- a/macros/ruby.m4 ++++ b/macros/ruby.m4 +@@ -35,7 +35,7 @@ AC_DEFUN([AC_RUBY_DEVEL], + RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["libdir"]] || Config::CONFIG[["libdir"]]'` + + dnl Get Ruby extensions directory +- RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'` ++ RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["vendorarchdir"]] || Config::CONFIG[["vendorarchdir"]]'` + + dnl Get Ruby shared library name, this does not include the lib prefix or extension name + RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY_SO"]] || Config::CONFIG[["RUBY_SO_NAME"]]'` -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geos.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel