travis-ci: switch to xenial for most configs

.travis.yml

@@ -32,7 +32,7 @@ language: perl
 dist: trusty
 matrix:
   include:
-## Fastest results (5-6 min)
+## Fastest results (8 min)
     - perl: "5.14"
       env: USE_MODPERL=1 USE_SYSTEM_PERL=1
       dist: precise
@@ -49,6 +49,7 @@ matrix:
 ## Perl with no dot in @INC
     - perl: "5.26"
       env: BBBIKE_TEST_SKIP_MODPERL=1 BBBIKE_TEST_GUI=1
+      dist: xenial
     - perl: "5.30"
       env: BBBIKE_TEST_SKIP_MODPERL=1 BBBIKE_TEST_SKIP_MAPSERVER=0
     - perl: "5.18"

port/travis-ci/travis-functions.sh

@@ -186,7 +186,12 @@ install_webserver_dependencies() {
 	then
 	    sudo apt-get install -y $apt_quiet --no-install-recommends libapache2-mod-perl2 libapache2-reload-perl
 	else
-	    sudo apt-get install -y $apt_quiet --no-install-recommends apache2-prefork-dev
+	    if [ "$CODENAME" = "trusty" -o "$CODENAME" = "precise" ]
+	    then
+		sudo apt-get install -y $apt_quiet --no-install-recommends apache2-prefork-dev
+	    else
+		sudo apt-get install -y $apt_quiet --no-install-recommends apache2-dev
+	    fi
 	    cpanm --quiet --notest mod_perl2 --configure-args="MP_APXS=/usr/bin/apxs2 MP_AP_DESTDIR=$PERLBREW_ROOT/perls/$PERLBREW_PERL/"
 	    sudo sh -c "echo LoadModule perl_module $PERLBREW_ROOT/perls/$PERLBREW_PERL/usr/lib/apache2/modules/mod_perl.so > /etc/apache2/mods-enabled/perl.load"
 	fi