This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository geos.
commit a38df2a7906e5705a5732ee7a05ed341ccf6ad11 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Feb 16 19:52:07 2014 +0100 Merge changes from geos (3.4.2-1.1) non-maintainer upload. --- debian/changelog | 7 +++++++ debian/control | 3 +-- debian/control.in | 3 +-- debian/libgeos-ruby1.8.install | 1 + debian/patches/libruby | 21 +++++++++++++++++---- debian/rules | 5 ----- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa9783b..9107669 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +geos (3.4.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build for current Ruby version. (Closes: #735652) + + -- Christian Hofstaedtler <z...@debian.org> Thu, 13 Feb 2014 02:29:40 +0100 + geos (3.4.2-1) unstable; urgency=low [ Markus Wanner and Francesco Paolo Lovergine ] diff --git a/debian/control b/debian/control index 4e77bec..f289ebe 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev, autotools-dev -Build-Conflicts: ruby1.9.1, ruby1.9.1-dev +Build-Depends: debhelper (>= 9), doxygen, swig, ruby, ruby-all-dev, autotools-dev Standards-Version: 3.9.3 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git diff --git a/debian/control.in b/debian/control.in index 98337f0..26b005c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,8 +3,7 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev, autotools-dev -Build-Conflicts: ruby1.9.1, ruby1.9.1-dev +Build-Depends: debhelper (>= 9), doxygen, swig, ruby, ruby-all-dev, autotools-dev Standards-Version: 3.9.3 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git diff --git a/debian/libgeos-ruby1.8.install b/debian/libgeos-ruby1.8.install new file mode 100644 index 0000000..3127429 --- /dev/null +++ b/debian/libgeos-ruby1.8.install @@ -0,0 +1 @@ +usr/lib/*/*ruby/*/*/*.so diff --git a/debian/patches/libruby b/debian/patches/libruby index ce5f74a..052821c 100644 --- a/debian/patches/libruby +++ b/debian/patches/libruby @@ -1,8 +1,8 @@ -Index: geos/swig/ruby/Makefile.in +Index: geos-3.4.2/swig/ruby/Makefile.in =================================================================== ---- geos.orig/swig/ruby/Makefile.in 2013-12-06 09:09:30.741373190 +0100 -+++ geos/swig/ruby/Makefile.in 2013-12-06 15:23:44.520742796 +0100 -@@ -334,7 +334,7 @@ +--- geos-3.4.2.orig/swig/ruby/Makefile.in 2014-02-13 02:46:17.805363739 +0100 ++++ geos-3.4.2/swig/ruby/Makefile.in 2014-02-13 02:46:17.797363820 +0100 +@@ -334,7 +334,7 @@ MAINTAINERCLEANFILES = geos_wrap.cxx # Build Ruby module as shared library @ENABLE_RUBY_TRUE@rubyextensiondir_LTLIBRARIES = geos.la @ENABLE_RUBY_TRUE@geos_la_SOURCES = geos_wrap.cxx @@ -11,3 +11,16 @@ Index: geos/swig/ruby/Makefile.in # Only need to grab the capi header files @ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = -I$(top_builddir)/capi +Index: geos-3.4.2/configure +=================================================================== +--- geos-3.4.2.orig/configure 2014-02-13 02:46:17.805363739 +0100 ++++ geos-3.4.2/configure 2014-02-13 02:46:17.801363780 +0100 +@@ -17097,7 +17097,7 @@ fi + + RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'` + +- 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"]'` + + RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_SO"] || Config::CONFIG["RUBY_SO_NAME"]'` + diff --git a/debian/rules b/debian/rules index f2a032d..3c5671d 100755 --- a/debian/rules +++ b/debian/rules @@ -120,11 +120,6 @@ install-arch: dh_installman -plibgeos-dev debian/geos-config.1 # remove the library from the -dev package rm -f $(CURDIR)/debian/libgeos-dev/usr/lib/libgeos-*.so - # debian/libgeos-ruby1.8 - mkdir -p debian/libgeos-ruby1.8/usr/lib/ruby/ - cp -ax debian/tmp/usr/local/lib/site_ruby/1.8 \ - debian/libgeos-ruby1.8/usr/lib/ruby/1.8 - find debian/libgeos-ruby*/usr/lib/ruby -name "*.la" -delete || true # Must not depend on anything. This is to be called by # binary-arch/binary-indep -- 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