summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-06 18:01:02 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-06 18:01:21 +0000
commit91a17d997613b697c2b7bf960029a6d38564eea5 (patch)
treea2e337bda00f1a58b9317a2e44acbcbe1f51182f
parentMerging upstream version 2.11.3. (diff)
downloadicinga2-91a17d997613b697c2b7bf960029a6d38564eea5.tar.xz
icinga2-91a17d997613b697c2b7bf960029a6d38564eea5.zip
Merging debian version 2.11.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog20
-rw-r--r--debian/compat1
-rw-r--r--debian/control5
-rw-r--r--debian/patches/boost-1.71.patch75
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules8
-rw-r--r--debian/upstream/metadata2
7 files changed, 103 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 23fbe7f..735e59d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+icinga2 (2.11.3-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Debian Janitor ]
+ * Bump debhelper from old 9 to 12.
+ * Drop unnecessary dh arguments: --parallel
+ * Remove obsolete fields Name from debian/upstream/metadata.
+ * Rely on pre-initialized dpkg-architecture variables.
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Bump Standards-Version to 4.5.0, no changes.
+ * Add patch by Giovanni Mascellani to fix FTBFS with Boost 1.71.
+ (closes: #949836)
+ * Add lsb-base to icinga2-bin dependencies.
+ * Replace dh_systemd_enable override with dh_installsystemd.
+
+ -- Bas Couwenberg <sebastic@debian.org> Tue, 03 Mar 2020 11:53:43 +0100
+
icinga2 (2.11.2-1~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 59f388e..331655d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: bash-completion,
bison,
cmake (>= 2.8.8),
cmake (>= 3.2.2) | pkg-config,
- debhelper (>= 10.1),
+ debhelper-compat (= 12),
flex,
g++ (>= 1.96),
libboost-dev,
@@ -32,7 +32,7 @@ Build-Depends: bash-completion,
libwxgtk3.0-gtk3-dev,
make (>= 3.81),
po-debconf
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
Vcs-Browser: https://git.progress-linux.org/distributions/engywuck-backports/packages/icinga2
Vcs-Git: https://git.progress-linux.org/distributions/engywuck-backports/packages/icinga2
XSBC-Original-Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-icinga2
@@ -99,6 +99,7 @@ Description: host and network monitoring system - common files
Package: icinga2-bin
Architecture: any
Depends: icinga2-common (= ${source:Version}),
+ lsb-base,
${misc:Depends},
${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/patches/boost-1.71.patch b/debian/patches/boost-1.71.patch
new file mode 100644
index 0000000..3267375
--- /dev/null
+++ b/debian/patches/boost-1.71.patch
@@ -0,0 +1,75 @@
+Description: Fix building with Boost 1.71.
+ The CMake file that detects Boost.Test version uses an older version
+ format, and incorrectly thinks that the available Boost version is
+ very old. This patch removes the version check, since Debian already
+ has a sufficiently recent Boost version.
+Author: Giovanni Mascellani <gio@debian.org>
+Bug-Debian: https://bugs.debian.org/949836
+Forwarded: https://github.com/Icinga/icinga2/pull/7780
+Applied-Upstream: https://github.com/Icinga/icinga2/commit/fe8701d77eb45770a29e17e1bae099d51d826d8a
+
+--- a/third-party/cmake/BoostTestTargets.cmake
++++ b/third-party/cmake/BoostTestTargets.cmake
+@@ -47,27 +47,27 @@ set(BOOST_TEST_TARGET_PREFIX "boosttest"
+ if(NOT Boost_FOUND)
+ find_package(Boost 1.34.0 QUIET)
+ endif()
+-if("${Boost_VERSION}0" LESS "1034000")
+- set(_shared_msg
+- "NOTE: boost::test-based targets and tests cannot "
+- "be added: boost >= 1.34.0 required but not found. "
+- "(found: '${Boost_VERSION}'; want >=103400) ")
+- if(BUILD_TESTING)
+- message(FATAL_ERROR
+- ${_shared_msg}
+- "You may disable BUILD_TESTING to continue without the "
+- "tests.")
+- else()
+- message(STATUS
+- ${_shared_msg}
+- "BUILD_TESTING disabled, so continuing anyway.")
+- endif()
+-endif()
++# if("${Boost_VERSION}0" LESS "1034000")
++# set(_shared_msg
++# "NOTE: boost::test-based targets and tests cannot "
++# "be added: boost >= 1.34.0 required but not found. "
++# "(found: '${Boost_VERSION}'; want >=103400) ")
++# if(BUILD_TESTING)
++# message(FATAL_ERROR
++# ${_shared_msg}
++# "You may disable BUILD_TESTING to continue without the "
++# "tests.")
++# else()
++# message(STATUS
++# ${_shared_msg}
++# "BUILD_TESTING disabled, so continuing anyway.")
++# endif()
++# endif()
+
+ include(GetForceIncludeDefinitions)
+ include(CopyResourcesToBuildTree)
+
+-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++if(Boost_FOUND)
+ set(_boosttesttargets_libs)
+ set(_boostConfig "BoostTestTargetsIncluded.h")
+ if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+@@ -144,7 +144,7 @@ function(add_boost_test _name)
+ "Syntax error in use of add_boost_test: at least one source file required!")
+ endif()
+
+- if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++ if(Boost_FOUND)
+
+ include_directories(${Boost_INCLUDE_DIRS})
+
+@@ -236,7 +236,7 @@ function(add_boost_test _name)
+ set(_test_command ${_target_name})
+ endif()
+
+- if(TESTS AND "${Boost_VERSION}" VERSION_GREATER "103799")
++ if(TESTS)
+ foreach(_test ${TESTS})
+ add_test(NAME
+ ${_name}-${_test}
diff --git a/debian/patches/series b/debian/patches/series
index 6bcd417..4033abe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
21_config_changes
postgres-checkcommand.patch
+boost-1.71.patch
diff --git a/debian/rules b/debian/rules
index 818d70d..8d31493 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+include /usr/share/dpkg/architecture.mk
export CTEST_OUTPUT_ON_FAILURE=1
@@ -15,7 +15,7 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),"armhf mips mipsel"))
endif
%:
- dh $@ --with systemd --with bash_completion --parallel
+ dh $@ --with bash_completion
override_dh_auto_clean:
dh_auto_clean
@@ -70,8 +70,8 @@ override_dh_install-indep:
override_dh_installinit:
dh_installinit --name=icinga2
-override_dh_systemd_enable:
- dh_systemd_enable --name=icinga2
+override_dh_installsystemd:
+ dh_installsystemd --name=icinga2
override_dh_compress:
dh_compress
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 9c1d89a..9b98120 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,6 +1,4 @@
----
Bug-Database: https://github.com/Icinga/icinga2/issues
Bug-Submit: https://github.com/Icinga/icinga2/issues/new
-Name: Icinga 2
Repository: https://github.com/Icinga/icinga2.git
Repository-Browse: https://github.com/Icinga/icinga2