From 6e310c714762c7acb8fe5ed96f4b2418bf836d17 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 19 Mar 2019 17:32:37 +0100 Subject: [PATCH 1/2] Force use of meson 0.49.2 --- travis/install_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/install_deps.sh b/travis/install_deps.sh index 10e277d..c0fed16 100755 --- a/travis/install_deps.sh +++ b/travis/install_deps.sh @@ -32,7 +32,7 @@ sudo apt-get install -qq python3-pip ${PACKAGES} wget https://bootstrap.pypa.io/get-pip.py 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 # Ninja cd $HOME From 51a4a4e8ef664f1e4c40dd4353600662f90666bb Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 18 Mar 2019 16:15:30 +0100 Subject: [PATCH 2/2] Version 1.1.0 --- Changelog | 9 +++++++++ meson.build | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 4f0de73..5adc36a 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,12 @@ +kiwix-tools 1.1.0 +================= + +kiwix-serve +----------- + + * Fix bug about handling of absolute url in old zim file. + * All the catalog to be searched by tags. + kiwix-tools 1.0.0 ================= diff --git a/meson.build b/meson.build index 2004c29..24493b6 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('kiwix-tools', 'cpp', - version : '1.0.0', + version : '1.1.0', license : 'GPL', default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true']) @@ -11,7 +11,7 @@ if static_linkage endif thread_dep = dependency('threads') -kiwixlib_dep = dependency('kiwix', version:'>=4.0.0', static:static_linkage) +kiwixlib_dep = dependency('kiwix', version:'>=4.1.0', static:static_linkage) microhttpd_dep = dependency('libmicrohttpd', static:static_linkage) z_dep = dependency('zlib', static:static_linkage)