From 7aa73ca3693e8a8a13b3b4aa50035e26c0a95f07 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 15 Feb 2019 09:24:31 +0100 Subject: [PATCH] packaging --- packaging/debian/debian/control | 6 ++++-- src/configure.ac | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index 083c1922..28be05e7 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -7,14 +7,16 @@ Build-Depends: autotools-dev, debhelper (>= 9), dh-python, dpkg-dev (>= 1.16.1~), - libqt5webkit5-dev, + libchm-dev, libx11-dev, libxapian-dev (>= 1.2.0), + libxslt1-dev, libz-dev, python-dev (>= 2.6.6-3~), python3-all-dev, - qt5-qmake, qt5-default, + qt5-qmake, + libqt5webkit5-dev, qtbase5-dev X-Python-Version: >= 3.4 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/recoll.git diff --git a/src/configure.ac b/src/configure.ac index c52e7f8f..96d53871 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -556,8 +556,11 @@ AC_SUBST(RCLLIBVERSION) AC_SUBST(XSLT_CFLAGS) AC_SUBST(XSLT_LINKADD) -AC_CONFIG_FILES([Makefile testmains/Makefile - python/recoll/setup.py - python/pychm/setup.py]) +AC_CONFIG_FILES([Makefile python/recoll/setup.py + python/pychm/setup.py]) + +if test X$buildtestmains = Xyes ; then + AC_CONFIG_FILES([testmains/Makefile]) +fi AC_OUTPUT