[SCM] geos branch, master, updated. upstream/3.3.3-79-gca59f58

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit ca59f582e16466e1ccd3b4142637559d6d722b23
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Dec 6 15:25:12 2013 +0100

    Added a simple patch in order to prevent a FTBS for Ruby binding.

diff --git a/debian/changelog b/debian/changelog
index 90f1993..aa9783b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ geos (3.4.2-1) unstable; urgency=low
     (closes: #726455)
   * Update watch file, handle common mistakes.
 
+  [ Francesco Paolo Lovergine ]
+  * Added an idiot-proof ruby patch for libtool in order to avoid a FTBS.
+
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 06 Dec 2013 13:48:39 +0100
 
 geos (3.3.3-1.1) unstable; urgency=low
diff --git a/debian/patches/libruby b/debian/patches/libruby
new file mode 100644
index 0000000..ce5f74a
--- /dev/null
+++ b/debian/patches/libruby
@@ -0,0 +1,13 @@
+Index: geos/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 @@
+ # Build Ruby module as shared library
+ @ENABLE_RUBY_TRUE at rubyextensiondir_LTLIBRARIES = geos.la
+ @ENABLE_RUBY_TRUE at geos_la_SOURCES = geos_wrap.cxx
+- at ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME)
++ at ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
+ 
+ # Only need to grab the capi header files
+ @ENABLE_RUBY_TRUE at geos_la_CPPFLAGS = -I$(top_builddir)/capi
diff --git a/debian/patches/series b/debian/patches/series
index be57c8e..1286296 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ TaggedLineString.cpp
 TaggedLineString.h
 TaggedLineStringSimplifier.h
 geos-config
+libruby

-- 
Geometry engine for Geographic Information Systems