From: Regina Obe <lr@pcorp.us>
Date: Tue, 10 Feb 2015 04:41:06 +0000 (+0000)
Subject: #3032 force eol to be unix LF for this file and accept mwtoews patch (I'm going to... 
X-Git-Tag: 2.2.0rc1~686
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a42a5f89302dadf155b9a26d774840320992091;p=postgis

#3032 force eol to be unix LF for this file and accept mwtoews patch (I'm going to trust he knows what he's doing with travis better than I do strk check)

git-svn-id: http://svn.osgeo.org/postgis/trunk@13208 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/.travis.yml b/.travis.yml
index c856c0de6..0ffa6fd8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,29 @@
-env:
-  global:
-    - PGUSER=postgres
-    - RUNTESTFLAGS=-v
-before_install:
-  #- rm .travis.yml
-  - sudo apt-get update
-  #- apt-cache search libgdal
-  - sudo apt-get purge -q postgresql-9.3 postgresql-9.2 postgresql-9.1-postgis-scripts postgresql-9.2-postgis-scripts postgresql-9.3-postgis-scripts postgresql-client postgresql-client-9.2  postgresql-client-9.3 liblwgeom-2.1.3 postgis
-  - sudo apt-get autoremove -q --purge
-  - sudo apt-get install -q build-essential flex autoconf libtool gfortran postgresql-server-dev-9.1 postgresql-client-9.1 postgresql-9.1 xsltproc libjson0-dev libproj-dev dblatex xsltproc libcunit1-dev libcunit1 docbook-xsl docbook-mathml libgdal-dev libgeos-dev
-  - dpkg -l | grep postgresql
-  - git config --global user.name "PostGIS Travis CI"
-  - git config --global user.email $HOSTNAME":not-for-mail@travis-ci.org"
-  - ./autogen.sh
-language: c
-compiler:
-  - gcc
-notifications:
-  email: false
-  irc:
-    channels:
-      - "irc.freenode.org#postgis"
-    on_success: change
-    on_failure: always
-    use_notice: false
-#after_failure:
-#  - cat /tmp/pgis_reg/*
+env:
+  global:
+    - RUNTESTFLAGS=-v
+
+addons:
+  postgresql: "9.4"
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y
+      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
+  - dpkg -l | grep postgresql
+  - ./autogen.sh
+
+language: c
+
+compiler: gcc
+
+notifications:
+  email: false
+  irc:
+    channels:
+      - "irc.freenode.org#postgis"
+    on_success: change
+    on_failure: always
+    use_notice: false