[SCM] geos branch, master, updated. upstream/3.3.3-72-g15f0d15

[Markus Wanner]

The following commit has been merged in the master branch:
commit 7916329b642b4b749a8ac39850cc94be05dd5d4d
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Oct 2 20:56:52 2013 +0200

    Merged NMU for #676094.

diff --git a/debian/changelog b/debian/changelog
index 4ac3fbe..c164639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+geos (3.3.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build-depend on ruby/ruby-dev1.8 and build-conflict on ruby/ruby-dev1.9 to
+    ensure the package continues to be built using ruby1.8 (Closes: #676094)
+    - Thanks to Peter Green and Raspbian for the patch
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 10 Jul 2012 23:39:07 -0400
+
 geos (3.3.3-1) unstable; urgency=low
 
   * New upstream bugfixing version. This is useful because correctly
diff --git a/debian/control b/debian/control
index 1eba67a..37d3a65 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: science
 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, ruby, ruby-dev
+Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev
+Build-Conflicts: ruby1.9.1, ruby1.9.1-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 34daf78..bdb089e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,8 @@ Section: science
 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, ruby, ruby-dev
+Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev
+Build-Conflicts: ruby1.9.1, ruby1.9.1-dev
 Standards-Version: 3.9.3
 Homepage: http://trac.osgeo.org/geos/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git

-- 
Geometry engine for Geographic Information Systems