diff --git a/CURRENT_VERSION b/CURRENT_VERSION index 261f3475721..46882bcf3de 100644 --- a/CURRENT_VERSION +++ b/CURRENT_VERSION @@ -1 +1 @@ -v1.1.5 \ No newline at end of file +v1.1.6 \ No newline at end of file diff --git a/Changelog b/Changelog index d81a51ac581..311b6221863 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,9 @@ +hal-reverse (1.1.6) bionic; urgency=medium + + * Fixed ubuntu ppa build + + -- Sebastian Wallat Mon, 05 Aug 2019 15:55:18 +0200 + hal-reverse (1.1.5) bionic; urgency=medium * Added uninstall target and fixed make/ninja install on linux with correct ldconfig settings diff --git a/installer/CMakeLists.txt b/installer/CMakeLists.txt index 38f9e7734fc..803b923bbaf 100644 --- a/installer/CMakeLists.txt +++ b/installer/CMakeLists.txt @@ -36,7 +36,7 @@ if (PACKAGE_DEB) set(CPACK_DEBIAN_PACKAGE_SECTION libs) set(CPACK_DEBIAN_PACKAGE_PRIORITY optional) set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-all-dev (>= 1.62)" "libstdc++6 (>= 6.3)" "libgomp1 (>= 6.3)" "libc6 (>= 2.24)" "libqt5widgets5 (>= 5.7)" "libqt5concurrent5 (>= 5.7)" "python3 (>= 3.6)" "python3-pybind11 (>= 2)" "libqt5svg5-dev (>= 5.9.5)" "python3-jedi (>= 0.11)") - set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS "pkg-config" "git" "devscripts" "dh-make" "pkgconf (>= 0.9)" "libboost-all-dev (>= 1.62)" "cmake (>= 3.7)" "g++ (>= 6.3)" "qt5-default (>= 5.7)" "libpython3.7-dev (>= 3.7)" "libqt5svg5-dev (>= 5.9.5)" "python3-sphinx (>= 1.6)" "python3-sphinx-rtd-theme (>= 0.2)" "pybind11-dev (>=2.0)" "python3-pybind11 (>=2.0)" "rapidjson-dev (>=1.1.0)" "libspdlog-dev (>= 0.16.3)") + set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS "pkg-config" "git" "devscripts" "dh-make" "pkgconf (>= 0.9)" "libboost-all-dev (>= 1.62)" "cmake (>= 3.7)" "g++ (>= 6.3)" "qt5-default (>= 5.7)" "libpython3.7-dev (>= 3.7)" "libqt5svg5-dev (>= 5.9.5)" "python3-sphinx (>= 1.6)" "python3-sphinx-rtd-theme (>= 0.2)" "pybind11-dev (>=2.0)" "python3-pybind11 (>=2.0)" "rapidjson-dev (>=1.1.0)" "libspdlog-dev (>= 0.16.3)" "libigraph0-dev (>= 0.7.1)") set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hal-plugins (<= 0.0.22)") if (NOT PPA_DEBIAN_VERSION) set(PPA_DEBIAN_VERSION ppa1)