[pkg-nagios-changes] [Git][nagios-team/pkg-check-multi][master] 8 commits: Include changes from NMU.

Bas Couwenberg gitlab at salsa.debian.org
Fri Nov 20 09:25:44 GMT 2020 


Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-check-multi


Commits:
52a018eb by Bas Couwenberg at 2020-11-20T09:59:55+01:00
Include changes from NMU.

- - - - -
ab58139f by Bas Couwenberg at 2020-11-20T10:00:29+01:00
Bump Standards-Version to 4.5.0, no changes.

- - - - -
42bd5c88 by Bas Couwenberg at 2020-11-20T10:14:11+01:00
Use priority optional instead of extra.

- - - - -
db9f2cb7 by Bas Couwenberg at 2020-11-20T10:14:11+01:00
Use pkg-info.mk instead of dpkg-parsechangelog.

- - - - -
68014b41 by Bas Couwenberg at 2020-11-20T10:14:11+01:00
Add lintian override for spare-manual-page.

- - - - -
6aa4ddcc by Bas Couwenberg at 2020-11-20T10:14:11+01:00
Mark patches as Forwarded: not-needed.

- - - - -
66ac905e by Bas Couwenberg at 2020-11-20T10:18:30+01:00
Add gbp.conf to use pristine-tar & --source-only-changes by default.

- - - - -
29c21f01 by Bas Couwenberg at 2020-11-20T10:18:30+01:00
Set distribution to unstable.

- - - - -


8 changed files:

- debian/changelog
- debian/control
- + debian/gbp.conf
- + debian/lintian-overrides
- debian/patches/0.26-defang-make-all.patch
- debian/patches/0.26-make-test.patch
- debian/patches/unescaped-left-brace-in-regex.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,17 +1,32 @@
-nagios-plugin-check-multi (0.26-4) UNRELEASED; urgency=medium
+nagios-plugin-check-multi (0.26-4) unstable; urgency=medium
+
+  * Team upload.
 
   [ Bas Couwenberg ]
-  * Bump Standards-Version to 4.3.0, no changes.
+  * Bump Standards-Version to 4.5.0, changes:
+    - Use priority optional instead of extra
   * Bump debhelper compat to 10, changes:
     - Don't explicitly enable autoreconf, enabled by default
     - Drop dh-autoreconf build dependency
   * Update watch file to use GitHub releases.
   * Bump watch file version to 4.
+  * Use pkg-info.mk instead of dpkg-parsechangelog.
+  * Add lintian override for spare-manual-page.
+  * Add gbp.conf to use pristine-tar & --source-only-changes by default.
 
   [ Marc Haber ]
   * new salsa URLs and new github Homepage in debian/control
 
- -- Bas Couwenberg <sebastic at debian.org>  Thu, 05 Jul 2018 11:32:17 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 20 Nov 2020 10:00:32 +0100
+
+nagios-plugin-check-multi (0.26-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with Perl 5.26: Unescaped left brace in regex is
+    deprecated here": update unescaped-left-brace-in-regex.patch to escape one
+    more '{'. (Closes: #865888)
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 14 Jul 2017 22:42:46 +0200
 
 nagios-plugin-check-multi (0.26-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -2,10 +2,10 @@ Source: nagios-plugin-check-multi
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Stig Sandbeck Mathisen <ssm at debian.org>
 Section: net
-Priority: extra
+Priority: optional
 Build-Depends: debhelper (>= 10~),
                help2man
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-check-multi
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-check-multi.git
 Homepage: https://github.com/flackem/check_multi


=====================================
debian/gbp.conf
=====================================
@@ -0,0 +1,19 @@
+[DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+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
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
+pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes


=====================================
debian/lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Executable is in /usr/lib/nagios/plugins
+spare-manual-page *
+


=====================================
debian/patches/0.26-defang-make-all.patch
=====================================
@@ -1,5 +1,6 @@
 Description: Ensure "make all" does not overwrite git hooks
 Author: Stig Sandbeck Mathisen <ssm at debian.org>
+Forwarded: not-needed
 
 --- a/Makefile.in
 +++ b/Makefile.in


=====================================
debian/patches/0.26-make-test.patch
=====================================
@@ -10,6 +10,7 @@ Description: Fix build test to work with perl 5.18
    module does not capture. There is a new "Usage: <options>" output
    to stdout, which is checked for instead.
 Author: Stig Sandbeck Mathisen <ssm at debian.org>
+Forwarded: not-needed
 
 --- a/plugins/t/10_check_multi.t.in
 +++ b/plugins/t/10_check_multi.t.in


=====================================
debian/patches/unescaped-left-brace-in-regex.patch
=====================================
@@ -26,3 +26,12 @@ Forwarded: https://github.com/flackem/check_multi/pull/16
  			$type="$1";
  			$typelist{$type}++;
  			$objectcount++;
+@@ -3217,7 +3217,7 @@ sub report_all {
+ 
+ 	#--- some debugging first
+ 	DEBUG4("MULTI Environment (sorted):\n\t".join("\n\t",get_env_vars('^MULTI')));
+-	DEBUG4("${NAGIOS} Environment (sorted):\n\t".join("\n\t",get_env_vars('^${NAGIOS}')));
++	DEBUG4("${NAGIOS} Environment (sorted):\n\t".join("\n\t",get_env_vars('^$\{NAGIOS}')));
+ 
+ 	#--- construction site for persistence
+ 	if ($opt{set}{test} && $opt{set}{persistent}) {


=====================================
debian/rules
=====================================
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DEB_VERSION := $(shell dpkg-parsechangelog --format rfc822 | grep-dctrl -ensVersion -S .)
+include /usr/share/dpkg/pkg-info.mk
 
 %:
 	dh $@



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-check-multi/-/compare/852c5a0d00acb2f04fa8c7fb1ea8055ce12d1bbc...29c21f012afe6df1b7da438ed36cbae56824f475

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-check-multi/-/compare/852c5a0d00acb2f04fa8c7fb1ea8055ce12d1bbc...29c21f012afe6df1b7da438ed36cbae56824f475
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20201120/9ff0f078/attachment-0001.html>

More information about the pkg-nagios-changes mailing list