From 279cdcda0b5256e7be469a8bbc9a370dc7985b1e Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 13 Mar 2024 15:00:15 +0100 Subject: [PATCH 1/4] Bump-up version to 3.7.0 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4b003c19..2b75ce43 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('kiwix-tools', 'cpp', - version : '3.6.0', + version : '3.7.0', license : 'GPL', default_options: ['c_std=c11', 'cpp_std=c++17', 'werror=true']) From d25fda82be0cf044e070e2d98f845ddfc84381ef Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 13 Mar 2024 15:01:12 +0100 Subject: [PATCH 2/4] Request libzim9 --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 2b75ce43..31180183 100644 --- a/meson.build +++ b/meson.build @@ -16,10 +16,10 @@ if static_linkage endif thread_dep = dependency('threads') -kiwixlib_dep = dependency('kiwix', version:'>=13.0.0', static:static_linkage) -kiwixlib_dep = dependency('kiwix', version:'<14.0.0', static:static_linkage) libzim_dep = dependency('libzim', version:'>=9.0.0', static:static_linkage) libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage) +kiwixlib_dep = dependency('kiwix', version:'>=13.0.0', static:static_linkage) +kiwixlib_dep = dependency('kiwix', version:'<14.0.0', static:static_linkage) all_deps = [thread_dep, kiwixlib_dep, libzim_dep] From 43704c6154e20eb3f9b529ae6b9eb3486c2f7747 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 13 Mar 2024 15:03:53 +0100 Subject: [PATCH 3/4] Proper deb lizim/libkiwix dependencies --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 6e863dbd..91f5b990 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: utils Priority: optional Maintainer: Kiwix team Build-Depends: debhelper-compat (= 13), - libkiwix-dev (>= 10.0.0~), - libzim-dev (>= 7.2.0~), + libzim-dev (>= 9.0.0), libzim-dev (<< 10.0.0), + libkiwix-dev (>= 13.0.0), libkiwix-dev (<< 14.0.0), meson, pkg-config, Standards-Version: 4.5.0 From e37af51dd407b869defaa70dd0110dea98449ebd Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 13 Mar 2024 15:13:08 +0100 Subject: [PATCH 4/4] new 3.7.0 Changelog --- Changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Changelog b/Changelog index da6b04f1..680756ce 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,10 @@ +kiwix-tools 3.7.0 +================= + + * Fixed ZIM name vs Book name confusion in documentation (@veloman-yunkan #663) + * Fixes compilation dependencies to rely on appropriate version (@kelson42 #667) + * New --skipInvalid Kiwix Server command line option (@schuellerf @kelson42 #666) + kiwix-tools 3.6.0 =================