Make the travis stuff work (after some testing on a separate branch)

diff --git a/.travis.yml b/.travis.yml
index 8a9a2f7..c488a17 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,10 @@ language: c
 compiler:
   - clang
   - gcc
-before-install: 
-  - echo 'deb http://ftp.ubuntu.com/ubuntu trusty main' > automake.list
-  - sudo mv automake.list /etc/apt/sources.list.d/
-  - echo -e 'Package: *\nPin: release a=trusty\nPin-Priority: 200' > automake.conf
-  - sudo mv automake.pref /etc/apt/preferences.d/
-  - sudo apt-get update
 install: 
+  - sudo sh .travis/add-trusty
+  - sudo apt-get update
   - sudo apt-get -t trusty install automake
+  - sudo apt-get install docbook-utils
   - automake --version
-script: autoreconf -f -i && ./configure && make && make check
+script: ./autogen.sh && ./configure && make && make check

diff --git a/.travis/add-trusty b/.travis/add-trusty
new file mode 100644 (file)
index 0000000..413ada3
--- /dev/null
+++ b/.travis/add-trusty
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -x
+
+echo 'deb http://us.archive.ubuntu.com/ubuntu trusty main' > /etc/apt/sources.list.d/automake.list
+cat /etc/apt/sources.list.d/automake.list
+(
+  echo 'Package: *'
+  echo 'Pin: release a=trusty'
+  echo 'Pin-Priority: 200'
+) > /etc/apt/preferences.d/automake.pref
+cat /etc/apt/preferences.d/automake.pref