Bug#735652: geos: diff for NMU version 3.4.2-1.1

[Christian Hofstaedtler]

tags 735652 + patch
thanks

Dear maintainer,

I've prepared an NMU for geos (versioned as 3.4.2-1.1). The diff
is attached to this message.

As there was no activity on the bug for weeks, I'm going to upload
this right away.

Regards.

diff -Nru geos-3.4.2/debian/changelog geos-3.4.2/debian/changelog
--- geos-3.4.2/debian/changelog	2013-12-06 15:25:12.000000000 +0100
+++ geos-3.4.2/debian/changelog	2014-02-13 02:29:55.000000000 +0100
@@ -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 <zeha at 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 -Nru geos-3.4.2/debian/control geos-3.4.2/debian/control
--- geos-3.4.2/debian/control	2013-12-06 15:25:12.000000000 +0100
+++ geos-3.4.2/debian/control	2014-02-13 02:52:41.000000000 +0100
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at 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 -Nru geos-3.4.2/debian/control.in geos-3.4.2/debian/control.in
--- geos-3.4.2/debian/control.in	2013-12-06 15:25:12.000000000 +0100
+++ geos-3.4.2/debian/control.in	2014-02-13 02:31:11.000000000 +0100
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at 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 -Nru geos-3.4.2/debian/libgeos-ruby1.8.install geos-3.4.2/debian/libgeos-ruby1.8.install
--- geos-3.4.2/debian/libgeos-ruby1.8.install	1970-01-01 01:00:00.000000000 +0100
+++ geos-3.4.2/debian/libgeos-ruby1.8.install	2014-02-13 02:57:29.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/*/*ruby/*/*/*.so
diff -Nru geos-3.4.2/debian/patches/libruby geos-3.4.2/debian/patches/libruby
--- geos-3.4.2/debian/patches/libruby	2013-12-06 15:25:12.000000000 +0100
+++ geos-3.4.2/debian/patches/libruby	2014-02-13 02:46:19.000000000 +0100
@@ -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 at rubyextensiondir_LTLIBRARIES = geos.la
  @ENABLE_RUBY_TRUE at geos_la_SOURCES = geos_wrap.cxx
@@ -11,3 +11,16 @@
  
  # Only need to grab the capi header files
  @ENABLE_RUBY_TRUE at 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 -Nru geos-3.4.2/debian/rules geos-3.4.2/debian/rules
--- geos-3.4.2/debian/rules	2013-12-06 15:25:12.000000000 +0100
+++ geos-3.4.2/debian/rules	2014-02-13 02:47:21.000000000 +0100
@@ -120,11 +120,6 @@
 	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