summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-17 08:20:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-17 08:20:19 +0000
commitbab8a94f059c5499ece13970b7c49adf68ce258b (patch)
tree1366c0308e8747518d5655e6281ea97f76eb8f67
parentMerging upstream version 2.12.0~rc1. (diff)
downloadicinga2-bab8a94f059c5499ece13970b7c49adf68ce258b.tar.xz
icinga2-bab8a94f059c5499ece13970b7c49adf68ce258b.zip
Merging debian version 2.12.0~rc1-1~exp1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
-rw-r--r--debian/copyright4
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/patches/boost-1.71.patch75
-rw-r--r--debian/patches/postgres-checkcommand.patch2
-rw-r--r--debian/patches/series1
7 files changed, 14 insertions, 81 deletions
diff --git a/debian/changelog b/debian/changelog
index 1dc670a..83319ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+icinga2 (2.12.0~rc1-1~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream release candidate.
+ * Update copyright years for Icinga GmbH & Niels Lohmann.
+ * Drop boost-1.71.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org> Tue, 17 Mar 2020 06:12:42 +0100
+
icinga2 (2.11.3-2~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 331655d..23dca30 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ 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
-XSBC-Original-Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icinga2.git
+XSBC-Original-Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icinga2.git -b experimental
Homepage: https://icinga.com
Package: icinga2
diff --git a/debian/copyright b/debian/copyright
index 8a979be..82bc2e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: https://github.com/Icinga/icinga2
Files: *
Copyright: 2012-2019, Icinga Development Team (https://icinga.com)
- 2012, 2019, Icinga GmbH
+ 2012, 2019-2020, Icinga GmbH
License: GPL-2+ with OpenSSL exception
Files: etc/icinga2/scripts/mail-host-notification.sh
@@ -47,7 +47,7 @@ Copyright: 1990, Jarkko Oikarinen
License: GPL-1+
Files: third-party/nlohmann_json/*
-Copyright: 2013-2018, Niels Lohmann <http://nlohmann.me>
+Copyright: 2013-2019, Niels Lohmann <http://nlohmann.me>
License: Expat
Files: third-party/socketpair/socketpair.c
diff --git a/debian/gbp.conf b/debian/gbp.conf
index e3daba6..7cfab70 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = experimental
# git-import-orig uses the following names for the upstream tags.
# Change the value if you are not using git-import-orig
diff --git a/debian/patches/boost-1.71.patch b/debian/patches/boost-1.71.patch
deleted file mode 100644
index 3267375..0000000
--- a/debian/patches/boost-1.71.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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/postgres-checkcommand.patch b/debian/patches/postgres-checkcommand.patch
index 7582032..f10a9ff 100644
--- a/debian/patches/postgres-checkcommand.patch
+++ b/debian/patches/postgres-checkcommand.patch
@@ -5,7 +5,7 @@ Bug-Debian: https://bugs.debian.org/898833
--- a/itl/plugins-contrib.d/databases.conf
+++ b/itl/plugins-contrib.d/databases.conf
-@@ -508,7 +508,7 @@ object CheckCommand "oracle_health" {
+@@ -513,7 +513,7 @@ object CheckCommand "oracle_health" {
object CheckCommand "postgres" {
import "ipv4-or-ipv6"
diff --git a/debian/patches/series b/debian/patches/series
index 4033abe..6bcd417 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
21_config_changes
postgres-checkcommand.patch
-boost-1.71.patch