travis: another try to unbreak gdal/postgis

.travis.yml

@@ -6,30 +6,29 @@ compiler:
  #- clang
 
 # http://about.travis-ci.org/blog/2013-11-29-postgresql-92-93-now-available/
-# disabled since it conflicts with ubuntugis ppa
-#addons:
-#  postgresql: "9.3"
+addons:
+  postgresql: "9.3"
 
 before_install:
  # we need at least g++-4.7 for c++11 features
  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
  # grab more recent gdal/proj
- - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+ # breaks due to http://trac.osgeo.org/ubuntugis/ticket/39
+ #- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
  # more recent boost
  - sudo add-apt-repository -y ppa:boost-latest/ppa
  - sudo apt-get update -y
  # upgrade compilers
  - sudo apt-get install -y gcc-4.8 g++-4.8
- - sudo apt-get install -y make boost1.55 libgdal-dev postgis postgresql-9.1-postgis-2.0-scripts libpq-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
+ - sudo apt-get install -y make boost1.55 libgdal-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
  - wget http://mapnik.s3.amazonaws.com/deps/harfbuzz-0.9.24.tar.bz2
  - tar xf harfbuzz-0.9.24.tar.bz2
  - cd harfbuzz-0.9.24
  - ./configure && make && sudo make install
  - sudo ldconfig
  - cd ../
- - psql -c "drop database if exists template_postgis" -U postgres
- - psql -c "create database template_postgis" -U postgres
- - psql -c "create extension postgis" -d template_postgis -U postgres
+ - createdb template_postgis
+ - psql -c "CREATE EXTENSION postgis" template_postgis
 
 install:
  - if [ "${CXX}" = 'g++' ]; then export CXX="g++-4.8" && export CC="gcc-4.8"; fi;