From: Martin Matuska <martin@matuska.org>
Date: Mon, 17 Oct 2016 12:07:55 +0000 (+0200)
Subject: Switch Travis CI build to use the Ubuntu trusty image
X-Git-Tag: v3.2.2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6269cb00b84270aa1e2e61d6ad41ac071b94d8;p=thirdparty%2Flibarchive.git

Switch Travis CI build to use the Ubuntu trusty image
---

diff --git a/.travis.yml b/.travis.yml
index 8abca99b7..3a7aae334 100644
--- 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 3d1cda79d..fc82b0ef9 100644
--- 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.