Switch Travis CI build to use the Ubuntu trusty image

diff --git a/.travis.yml b/.travis.yml
index 8abca99b754d9f2585ac9a8baa5c3fd56845b229..3a7aae334b6164405b9e77bab05997b9b22bc42e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,13 @@
 language: C
-sudo: true
+sudo: required
+dist: trusty
 compiler:
   - gcc
   - clang
 env:
   - BUILD_SYSTEM=cmake
   - BUILD_SYSTEM=autotools
-before_install:
-  - if [ "${BUILD_SYSTEM}" = "cmake" ]; then sudo add-apt-repository ppa:kubuntu-ppa/backports -y; fi
-  - if [ "${BUILD_SYSTEM}" = "cmake" ]; then sudo apt-get update -qq; fi
 install:
-  - if [ "${BUILD_SYSTEM}" = "cmake" ]; then sudo apt-get install -y cmake=2.8.12.2-0ubuntu1~ubuntu12.04.1~ppa2; fi
   - sudo apt-get install -y libbz2-dev libzip-dev liblzma-dev
 script:
   - build/ci_build.sh

diff --git a/configure.ac b/configure.ac
index 3d1cda79debdee9afb7765c03ae1f53e9e3b66f4..fc82b0ef9d5fcf49fc94dabef26f8d4d23ff8332 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
 m4_define([BSDCPIO_VERSION_S],LIBARCHIVE_VERSION_S())
 m4_define([BSDCAT_VERSION_S],LIBARCHIVE_VERSION_S())
 
-AC_PREREQ([2.68])
+AC_PREREQ([2.69])
 
 #
 # Now starts the "real" configure script.