From 15dafcaa80bfc84d599b7a57ee091f50779eae71 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 19 Mar 2019 15:26:53 +0100 Subject: [PATCH 1/2] Force use of meson 0.49.2 --- travis/install_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/install_deps.sh b/travis/install_deps.sh index 83fc6bd06..b3db45b87 100755 --- a/travis/install_deps.sh +++ b/travis/install_deps.sh @@ -9,7 +9,7 @@ ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.xz cd $HOME if [[ "$TRAVIS_OS_NAME" == "osx" ]] then - pip3 install meson + pip3 install meson==0.49.2 wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip unzip ninja-mac.zip ninja @@ -18,7 +18,7 @@ else python3.5 get-pip.py --user python3.5 -m pip install --user --upgrade pip - python3.5 -m pip install --user meson + python3.5 -m pip install --user meson==0.49.2 wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip unzip ninja-linux.zip ninja From cd654b9caee36967c3b569ca2e89588c8648f9c5 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 18 Mar 2019 16:09:57 +0100 Subject: [PATCH 2/2] Version 4.1.0 --- ChangeLog | 7 +++++++ meson.build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c24e46f38..af787bf5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +kiwix-lib 4.1.0 +=============== + + * Allow the library to be filtered by tags. + * Fix language mapping. + * Update README about mustache dependency. + kiwix-lib 4.0.1 =============== diff --git a/meson.build b/meson.build index 8984ccfc5..3a11de65d 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('kiwix-lib', 'cpp', - version : '4.0.1', + version : '4.1.0', license : 'GPL', default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])