[SCM] grass branch, master, updated. upstream/6.4.1-114-g1142402

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 1142402fc53e05442918c096adee1b5fb5953176
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sun Jun 16 14:32:54 2013 +1200

    Enable GEOS support

diff --git a/debian/changelog b/debian/changelog
index 5b2db56..fb7e31c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ grass (6.4.2-3) unstable; urgency=low
   * Build-Depends on libpng-dev for LibPNG transition.
     (closes: #662361)
   * grass-dev needs to depend on libfreetype6-dev for building addons.
+  * Enable GEOS support
 
- -- M. Hamish Bowman <hamish_b at yahoo.com>  Sun, 17 Feb 2013 21:30:53 +1300
+ -- M. Hamish Bowman <hamish_b at yahoo.com>  Sun, 16 Jun 2013 14:27:59 +1200
 
 grass (6.4.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0c79949..20b7d74 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-depends:
   libfftw3-dev,
   libfreetype6-dev,
   libgdal-dev | libgdal1-dev (>= 1.5.0),
+  libgeos-dev,
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev,
   libpng-dev | libpng12-dev,
diff --git a/debian/control.in b/debian/control.in
index d47e109..b309f67 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,6 +15,7 @@ Build-depends:
   libfftw3-dev,
   libfreetype6-dev,
   libgdal-dev | libgdal1-dev (>= 1.5.0),
+  libgeos-dev,
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev,
   libpng-dev | libpng12-dev,
diff --git a/debian/rules b/debian/rules
index 147d6ca..cf12a95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,7 @@ endif
                     --with-cxx \
                     --with-x \
                     --with-gdal \
+                    --with-geos \
                     --with-freetype \
                     --with-motif \
                     --with-readline \

-- 
Geographic Resources Analysis Support System