From: Jaroslav Kysela Date: Wed, 17 May 2017 06:42:43 +0000 (+0200) Subject: another travis build fix X-Git-Tag: v4.2.3~79 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=148ea4464aa6ac427b2fba374f4921ce39a36e5d;p=thirdparty%2Ftvheadend.git another travis build fix --- diff --git a/.travis.yml b/.travis.yml index 0802a0f99..70a1bdc17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ # sudo: required -dist: xenial +dist: trusty language: c before_install: - sudo apt-get -qq update - - sudo ./Autobuild.sh -o deps + - sudo ./Autobuild.sh -t trusty-amd64 -o deps script: - - ./Autobuild.sh + - ./Autobuild.sh -t trusty-amd64 diff --git a/Autobuild/debian.sh b/Autobuild/debian.sh index 74b229366..e66b70349 100755 --- a/Autobuild/debian.sh +++ b/Autobuild/debian.sh @@ -24,6 +24,11 @@ END { print out; }' debian/control` +case "${DEBDIST}" in +precise|trusty|jessie) + BUILD_DEPS=`echo ${BUILD_DEPS} | sed -e 's/libpcre2-dev/libpcre3-dev/g'` ;; +esac + build() { $(dirname $0)/support/changelog "$CHANGELOG" "$DEBDIST" "$VER"