[postgis-tickets] r15577 - Revert changes done for gitlab upgrade

[Regina Obe]

Author: robe
Date: 2017-08-23 10:17:30 -0700 (Wed, 23 Aug 2017)
New Revision: 15577

Modified:
   trunk/.gitlab-ci.yml
   trunk/NEWS
   trunk/configure.ac
   trunk/doc/installation.xml
Log:
Revert changes done for gitlab upgrade
References #3813

Make GEOS 3.4 the new minimum
Closes #3810


Modified: trunk/.gitlab-ci.yml
===================================================================
--- trunk/.gitlab-ci.yml	2017-08-23 16:54:16 UTC (rev 15576)
+++ trunk/.gitlab-ci.yml	2017-08-23 17:17:30 UTC (rev 15577)
@@ -1,10 +1,7 @@
 test:
   script:
-    - apt-get update && apt-get install -y python-software-properties software-properties-common
-    - add-apt-repository --yes ppa:ubuntugis/ppa
-    - add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable
     - apt-get update -qq && apt-get install -y
-        postgresql-9.5 postgresql-server-dev-9.5
+        postgresql-9.4 postgresql-server-dev-9.4
         build-essential autoconf libtool libcunit1-dev
         xsltproc docbook-xsl docbook-mathml dblatex
         libproj-dev libgdal-dev libgeos-dev libjson0-dev

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2017-08-23 16:54:16 UTC (rev 15576)
+++ trunk/NEWS	2017-08-23 17:17:30 UTC (rev 15577)
@@ -30,7 +30,7 @@
           (Wouter Geraedts)
 
 * Breaking Changes *
-  - #3810, GEOS 3.5.0 or above minimum required to compile
+  - #3810, GEOS 3.4.0 or above minimum required to compile
 
 
 PostGIS 2.4.0alpha

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2017-08-23 16:54:16 UTC (rev 15576)
+++ trunk/configure.ac	2017-08-23 17:17:30 UTC (rev 15577)
@@ -669,10 +669,10 @@
 GEOS_NUMERIC_MINOR_VERSION=`printf "%02d" $GEOS_MINOR_VERSION`
 GEOS_NUMERIC_VERSION="$GEOS_MAJOR_VERSION$GEOS_NUMERIC_MINOR_VERSION$GEOS_NUMERIC_PATCH_VERSION"
 
-dnl Ensure that we are using GEOS >= 3.5.0
+dnl Ensure that we are using GEOS >= 3.4.0
 AC_MSG_RESULT([checking GEOS version... $GEOS_FULL_VERSION])
-if test ! "$GEOS_NUMERIC_VERSION" -ge 30500; then
-	AC_MSG_ERROR([PostGIS requires GEOS >= 3.5.0])
+if test ! "$GEOS_NUMERIC_VERSION" -ge 30400; then
+	AC_MSG_ERROR([PostGIS requires GEOS >= 3.4.0])
 fi
 
 dnl Extract the linker and include flags

Modified: trunk/doc/installation.xml
===================================================================
--- trunk/doc/installation.xml	2017-08-23 16:54:16 UTC (rev 15576)
+++ trunk/doc/installation.xml	2017-08-23 17:17:30 UTC (rev 15577)
@@ -139,8 +139,8 @@
 
 	  <listitem>
 		<para>
-		  GEOS geometry library, version 3.5 or greater, but GEOS 3.7+ is recommended to take full advantage of all the new functions and features.  Without GEOS 3.5,
-			you will be missing some major enhancements such as <xref linkend="ST_ClipByBox2D" /> and <xref linkend="ST_Subdivide" />. GEOS is available for download from
+		  GEOS geometry library, version 3.4 or greater, but GEOS 3.7+ is recommended to take full advantage of all the new functions and features.  You should have at least GEOS 3.5,
+			without which you will be missing some major enhancements such as <xref linkend="ST_ClipByBox2D" /> and <xref linkend="ST_Subdivide" />. GEOS is available for download from
 		  <ulink url="http://trac.osgeo.org/geos/">
 			http://trac.osgeo.org/geos/
 		  </ulink> and 3.5+ is backward-compatible with older versions so fairly safe to upgrade.