summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-03 09:33:21 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-03 09:33:35 +0000
commit2e3a6a4472a8f7840dfe75ff1a1119a5a5323fda (patch)
treef995ed95570879aa2e076810df689bf96c24ed0a
parentMerging upstream version 2.11.1. (diff)
downloadicinga2-2e3a6a4472a8f7840dfe75ff1a1119a5a5323fda.tar.xz
icinga2-2e3a6a4472a8f7840dfe75ff1a1119a5a5323fda.zip
Merging debian version 2.11.1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog18
-rw-r--r--debian/control4
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/icinga2-bin.lintian-overrides3
4 files changed, 21 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index c1bdc8a..c89aa30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+icinga2 (2.11.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Bump Standards-Version to 4.4.1, no changes.
+ * Drop unused override for file-references-package-build-path.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org> Fri, 18 Oct 2019 07:49:04 +0200
+
icinga2 (2.11.0-1~exp1~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
@@ -69,6 +79,14 @@ icinga2 (2.11.0~rc1-1~exp1) experimental; urgency=medium
-- Bas Couwenberg <sebastic@debian.org> Sat, 27 Jul 2019 08:06:39 +0200
+icinga2 (2.10.6-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Bump Standards-Version to 4.4.0, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org> Wed, 04 Sep 2019 11:37:41 +0200
+
icinga2 (2.10.5-1~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 267cd10..c93706d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,11 +32,11 @@ Build-Depends: bash-completion,
libwxgtk3.0-dev,
make (>= 3.81),
po-debconf
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
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 -b experimental
+XSBC-Original-Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icinga2.git
Homepage: https://icinga.com
Package: icinga2
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7cfab70..e3daba6 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 = experimental
+debian-branch = master
# 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/icinga2-bin.lintian-overrides b/debian/icinga2-bin.lintian-overrides
index 881aaca..94f4ea1 100644
--- a/debian/icinga2-bin.lintian-overrides
+++ b/debian/icinga2-bin.lintian-overrides
@@ -1,6 +1,3 @@
# this is actually a defined word in the livestatus protocol...
spelling-error-in-binary usr/lib/*/icinga2/sbin/icinga2 childs children
-# __FILE__ & assert() are used.
-file-references-package-build-path *
-