From c7cb87dd57f01641f1a09466257c6b636cb1f48f Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Fri, 24 Jul 2020 02:01:34 -0700 Subject: [PATCH] debian: Sync with proper Debian package * Switch to debhelper compat 13 * Increase test timeout via `meson test` * Depend on same version of libzim as meson.build specifies * Restore mistakenly deleted libkiwix-dev.manpages * We still need this file to instruct Debian to associate it with the libkiwix-dev package. --- debian/control | 4 ++-- debian/libkiwix-dev.manpages | 1 + debian/rules | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 debian/libkiwix-dev.manpages diff --git a/debian/control b/debian/control index 79a8dc123..d2595f640 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,10 @@ Source: libkiwix Priority: optional Maintainer: Kiwix team -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), meson, pkg-config, - libzim-dev (>= 6.0.0), + libzim-dev (>= 6.1.8), libcurl4-gnutls-dev, libicu-dev, libgtest-dev, diff --git a/debian/libkiwix-dev.manpages b/debian/libkiwix-dev.manpages new file mode 100644 index 000000000..ad9ef1d60 --- /dev/null +++ b/debian/libkiwix-dev.manpages @@ -0,0 +1 @@ +usr/share/man/man1/kiwix-compile-resources.1 diff --git a/debian/rules b/debian/rules index 74cc648ba..61a8dd045 100755 --- a/debian/rules +++ b/debian/rules @@ -3,3 +3,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ --buildsystem=meson + +override_dh_auto_test: + dh_auto_test -- -t 3