diff --git a/.travis.yml b/.travis.yml index 038a1d6421..1c8cc2ebf2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,6 +115,13 @@ before_install: if [[ "${TRAVIS_OS_NAME}" = "linux" ]] && [[ "${CC}" = "clang" ]]; then ln -sf "$(which llvm-cov)" /home/travis/bin/gcov fi + # Need msgfmt 0.19.8 to be able to generate .desktop files + - | + if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then + sudo add-apt-repository ppa:ricotz/toolchain -y && + sudo apt-get update -q && + sudo apt-get install gettext=0.19.8.1-1ubuntu2~14.04~ricotz1 -y + fi before_script: # Start virtual framebuffer to be able to test the GUI. Does not work on OS X. diff --git a/src/version.c b/src/version.c index 433f6bf4e4..efd117ea8b 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1150, /**/ 1149, /**/