[Python-modules-commits] [nagiosplugin] 09/11: merge patched into master

[Jan Dittberner]

This is an automated email from the git hooks/post-receive script.

jandd pushed a commit to branch master
in repository nagiosplugin.

commit 29bec68a73752d7286a88e6c041922f04990a579
Merge: f0137fb 39f0f54
Author: Jan Dittberner <jandd at debian.org>
Date:   Tue Jul 18 15:20:51 2017 +0200

    merge patched into master

 HACKING.txt                              |  36 +++----
 HISTORY.txt                              |  19 ++++
 PKG-INFO                                 |  71 +++++++------
 README.txt                               |   7 +-
 bootstrap.py                             | 170 -------------------------------
 buildout.cfg                             |  14 ++-
 debian/.git-dpm                          |   6 +-
 debian/patches/fix_example_shebang.patch |   2 +-
 setup.py                                 |   7 +-
 src/nagiosplugin.egg-info/PKG-INFO       |  71 +++++++------
 src/nagiosplugin.egg-info/SOURCES.txt    |   1 -
 src/nagiosplugin.egg-info/requires.txt   |   3 +-
 src/nagiosplugin/check.py                |  17 ++--
 src/nagiosplugin/context.py              |   6 +-
 src/nagiosplugin/metric.py               |   5 +-
 src/nagiosplugin/output.py               |  14 +--
 src/nagiosplugin/range.py                |   5 +-
 src/nagiosplugin/resource.py             |   3 -
 src/nagiosplugin/result.py               |   4 +-
 src/nagiosplugin/runtime.py              |  58 ++++++-----
 src/nagiosplugin/state.py                |   3 -
 src/nagiosplugin/summary.py              |   5 +-
 src/nagiosplugin/tests/test_check.py     |  32 +++++-
 src/nagiosplugin/tests/test_output.py    |  17 +++-
 src/nagiosplugin/tests/test_range.py     |   2 +-
 src/nagiosplugin/tests/test_result.py    |   3 -
 src/nagiosplugin/tests/test_runtime.py   |  19 +++-
 version.txt                              |   2 +-
 28 files changed, 254 insertions(+), 348 deletions(-)

diff --cc debian/.git-dpm
index 38ace3d,0000000..7b95616
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- b00f09c0f9bb3f7cf66a4b37500c4d271decfa33
- b00f09c0f9bb3f7cf66a4b37500c4d271decfa33
- 6400e22c8196ad74290456647cf0e12d447fc85f
++39f0f54dcb2935cdb76aa83820357f1d6ac08a04
++39f0f54dcb2935cdb76aa83820357f1d6ac08a04
++6040fc87c623f938fcc3c20955e240baa764b8c6
 +6040fc87c623f938fcc3c20955e240baa764b8c6
 +nagiosplugin_1.2.4.orig.tar.gz
 +d76df86ec7902f2e5cbf37e5aa49e5a4b41ecfa8
 +38290
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix_example_shebang.patch
index 6c394c2,0000000..62eee6e
mode 100644,000000..100644
--- a/debian/patches/fix_example_shebang.patch
+++ b/debian/patches/fix_example_shebang.patch
@@@ -1,53 -1,0 +1,53 @@@
- From b00f09c0f9bb3f7cf66a4b37500c4d271decfa33 Mon Sep 17 00:00:00 2001
++From 39f0f54dcb2935cdb76aa83820357f1d6ac08a04 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 09:58:28 -0700
 +Subject: fix_example_shebang
 +
 +Patch-Name: fix_example_shebang.patch
 +---
 + src/nagiosplugin/examples/check_haproxy_log.py | 2 +-
 + src/nagiosplugin/examples/check_load.py        | 2 +-
 + src/nagiosplugin/examples/check_users.py       | 2 +-
 + src/nagiosplugin/examples/check_world.py       | 2 +-
 + 4 files changed, 4 insertions(+), 4 deletions(-)
 +
 +diff --git a/src/nagiosplugin/examples/check_haproxy_log.py b/src/nagiosplugin/examples/check_haproxy_log.py
 +index a4bc5ef..70075a4 100755
 +--- a/src/nagiosplugin/examples/check_haproxy_log.py
 ++++ b/src/nagiosplugin/examples/check_haproxy_log.py
 +@@ -1,4 +1,4 @@
 +-#!python
 ++#!/usr/bin/env python
 + # Copyright (c) gocept gmbh & co. kg
 + # See also LICENSE.txt
 + 
 +diff --git a/src/nagiosplugin/examples/check_load.py b/src/nagiosplugin/examples/check_load.py
 +index 26e1321..5ccb4bc 100755
 +--- a/src/nagiosplugin/examples/check_load.py
 ++++ b/src/nagiosplugin/examples/check_load.py
 +@@ -1,4 +1,4 @@
 +-#!python
 ++#!/usr/bin/env python
 + # Copyright (c) gocept gmbh & co. kg
 + # See also LICENSE.txt
 + 
 +diff --git a/src/nagiosplugin/examples/check_users.py b/src/nagiosplugin/examples/check_users.py
 +index caf6c7a..1b9d6d4 100755
 +--- a/src/nagiosplugin/examples/check_users.py
 ++++ b/src/nagiosplugin/examples/check_users.py
 +@@ -1,4 +1,4 @@
 +-#!python
 ++#!/usr/bin/env python
 + # Copyright (c) gocept gmbh & co. kg
 + # See also LICENSE.txt
 + 
 +diff --git a/src/nagiosplugin/examples/check_world.py b/src/nagiosplugin/examples/check_world.py
 +index 1167d61..ec4a072 100755
 +--- a/src/nagiosplugin/examples/check_world.py
 ++++ b/src/nagiosplugin/examples/check_world.py
 +@@ -1,4 +1,4 @@
 +-#!python
 ++#!/usr/bin/env python
 + 
 + """Hello world Nagios check."""
 + 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nagiosplugin.git