[pkg-nagios-changes] [Git][nagios-team/pkg-monitoring-plugins][master] 7 commits: d/control: Priority extra is deprecated, using optional

Jan Wagner gitlab at salsa.debian.org
Sun May 13 18:21:23 BST 2018 

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / pkg-monitoring-plugins


Commits:
b024e212 by Jan Wagner at 2018-05-13T10:13:55+02:00
d/control: Priority extra is deprecated, using optional

- - - - -
90959231 by Jan Wagner at 2018-05-13T10:38:34+02:00
d/control: Drop old nagios-plugins* transitional packages (Closes: #878769)

- - - - -
6956bcc3 by Jan Wagner at 2018-05-13T11:21:17+02:00
d/control: Bump Standards-Version to 4.1.4.0, no changes needed

- - - - -
1fdd249b by Jan Wagner at 2018-05-13T11:30:21+02:00
d/changelog: Removing trailing whitespaces

- - - - -
d634e5ad by Jan Wagner at 2018-05-13T14:04:25+02:00
d/functions: Fixing ucf register function

- - - - -
dbabaf26 by Jan Wagner at 2018-05-13T14:05:11+02:00
d/changelog: Prepare release

- - - - -
95342bf7 by Jan Wagner at 2018-05-13T19:18:26+02:00
d/changelog: New changelog

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/functions


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
-monitoring-plugins (2.2-4~1.gbpcdc254) UNRELEASED; urgency=medium
+monitoring-plugins (2.2-5) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * 
 
- -- Jan Wagner <waja at cyconet.org>  Thu, 19 Jan 2017 08:59:46 +0100
+ -- Jan Wagner <waja at cyconet.org>  Sun, 13 May 2018 19:18:00 +0200
+
+monitoring-plugins (2.2-4) unstable; urgency=medium
+
+  * [97cb3c4] Drop symlinks to removed LEGAL file. (Closes: #856676)
+  * [878ceb9] Using absolut paths when using ucf, debconf 1.5.62 changed it's
+    behaviour (Closes: #867256)
+  * [22de139] d/control: Update VCS-headers
+  * [b024e21] d/control: Priority extra is deprecated, using optional
+  * [9095923] d/control: Drop old nagios-plugins* transitional packages
+    (Closes: #878769)
+  * [6956bcc] d/control: Bump Standards-Version to 4.1.4.0, no changes needed
+  * [d634e5a] d/functions: Fixing ucf register function
+
+ -- Jan Wagner <waja at cyconet.org>  Sun, 13 May 2018 14:04:35 +0200
 
 monitoring-plugins (2.2-3) unstable; urgency=medium
 
@@ -936,7 +950,7 @@ nagios-plugins (1.4.8-1) unstable; urgency=low
 
   [jan wagner]
   * add explicit IPv4 checks to disk.cfg, ftp.cfg, http.cfg, ldap.cfg,
-    mail.cfg, news.cfg, ping.cfg, pgsql.cfg, snmp.cfg, ssh.cfg, 
+    mail.cfg, news.cfg, ping.cfg, pgsql.cfg, snmp.cfg, ssh.cfg,
     tcp_udp.cfg and telnet.cfg
   * add check_bgpstate script from contrib to nagios-plugins-standard
   * add whois to Suggests of nagios-plugins-standard
@@ -947,9 +961,9 @@ nagios-plugins (1.4.8-1) unstable; urgency=low
   * add check_cups to http.cfg
 
   [sean finney]
-  * the Architecture should be "all" for the empty nagios-plugins 
+  * the Architecture should be "all" for the empty nagios-plugins
     metapackage (closes: #422083).
-  * merge changes from and ack NMU. Thanks to Michael Tautschnig 
+  * merge changes from and ack NMU. Thanks to Michael Tautschnig
     (closes: #420954).
   * modify the Suggests to prefer nagios2 to nagios-text.
   * remove the following patches, which have been included upstream:
@@ -992,7 +1006,7 @@ nagios-plugins (1.4.5-1) unstable; urgency=low
 nagios-plugins (1.4.4-2) unstable; urgency=low
 
   * fix for implicit definition of basename function, thanks to
-    dann frazier for finding it (closes: #396814). 
+    dann frazier for finding it (closes: #396814).
     patch: 26_implicit-basename.dpatch
   * aparently the check_ups fix caused problems as well as solved them.
     until we ge a real fix for the problem i'm reverting the patch.
@@ -1089,7 +1103,7 @@ nagios-plugins (1.4.3-1) unstable; urgency=low
     - 10_config.h_debiandefaults.dpatch
     - 14_check_log_paths.dpatch
     - 18_check_game_cmdline.dpatch
-  * removed the transitional (pre-sarge) fileutils dependency 
+  * removed the transitional (pre-sarge) fileutils dependency
     (closes: #368718), thanks to Stefan Huehner for pointing this out.
   * upstream now uses libtool, but the shipped libtool is out of date and
     has problems building against radiusclient1-dev (which might not be
@@ -1209,7 +1223,7 @@ nagios-plugins (1.4.2-3) unstable; urgency=low
       in check_disk_smb (closes: #300701).
     - updated the usage function in check_game to reflect changed
       cmdline options (closes: #307905).
-    - upstream is now shipping an non-broken ipv6-capable check_ping, 
+    - upstream is now shipping an non-broken ipv6-capable check_ping,
       with PING6_COMMAND properly set in config.h (closes: #309255).
     - upstream check_mysql can now check slave status (closes: #278864).
 
@@ -1222,7 +1236,7 @@ nagios-plugins (1.4.2-2) unstable; urgency=low
       wasn't being properly substituted in.  fixed. (closes: #332667).
     - include upstream fix for check_ups temperature perfdata.  thanks
       to Chris AtLee for originally reporting this (closes: #316534).
-    - stop mucking around with config.sub/config.guess in debian/rules. 
+    - stop mucking around with config.sub/config.guess in debian/rules.
     - last update in the changelog was missing a colon on the following:
       (closes: #312228, #306244, #308458, #327212, #316882).
     - have check_mysql read in defaults from my.cnf (closes: #278817).
@@ -1336,7 +1350,7 @@ nagios-plugins (1.4-1) unstable; urgency=low
 
 nagios-plugins (1.3.1.0-12) unstable; urgency=low
 
-  * Sorry for the multiple uploads trying to fix the problem... 
+  * Sorry for the multiple uploads trying to fix the problem...
     Unfortunately I don't have any !i386 handy. :(
   * This time #275803 should really be dealt with!
 
@@ -1367,7 +1381,7 @@ nagios-plugins (1.3.1.0-9) unstable; urgency=high
   * Fix check_breeze (thanks to Peter Palfrader for noticing it was broken)
     (closes: #265207)
   * Add to 04_checkswap two patches from Sean Finney plus one from me
-    (to avoid it returning STATE_CRITICAL when no swap is configured) 
+    (to avoid it returning STATE_CRITICAL when no swap is configured)
     (closes: #265152, #265154)
   * Also import:
     - Sven Velt patch for check_ircd (closes: #259720)
@@ -1380,8 +1394,8 @@ nagios-plugins (1.3.1.0-9) unstable; urgency=high
 
 nagios-plugins (1.3.1.0-8) unstable; urgency=low
 
-  * Import a backport of check_swap from upstream CVS done by 
-    "The Fungi" <fungi at yuggoth.org> to make swap checking 2.6 
+  * Import a backport of check_swap from upstream CVS done by
+    "The Fungi" <fungi at yuggoth.org> to make swap checking 2.6
     compatible (closes: #261151)
   * Postpone package splitting, so this version can go in sarge
     with nagios before we have to wait a bit in the NEW queue
@@ -1391,7 +1405,7 @@ nagios-plugins (1.3.1.0-8) unstable; urgency=low
 nagios-plugins (1.3.1.0-7) unstable; urgency=low
 
   * Add 03_hostwithnumbers.dpatch written by me to correct the behaviour
-    of is_hostname() in utils.c  about host components beginning with a 
+    of is_hostname() in utils.c  about host components beginning with a
     number (closes: #253620). Thanks to Andreas Edler who spotted
     the problem.
 
@@ -1450,8 +1464,8 @@ nagios-plugins (1.3.1-6) unstable; urgency=low
 
 nagios-plugins (1.3.1-5) unstable; urgency=low
 
-  * Adapt the choosen ping command to the fact that configure 
-    doesn't set PING_PACKETS_FIRST when PING_COMMAND is passed 
+  * Adapt the choosen ping command to the fact that configure
+    doesn't set PING_PACKETS_FIRST when PING_COMMAND is passed
     from the command line (closes: #233010)
 
  -- Guido Trotter <ultrotter at debian.org>  Mon, 16 Feb 2004 13:19:20 +0100
@@ -1463,9 +1477,9 @@ nagios-plugins (1.3.1-4) unstable; urgency=low
   * Give full path of libexec dir to configure (closes: #232436)
   * Remove empty dirs from debian/dirs
   * Ship command configuration in /usr/share/nagios/pluginconfig
-    These files are generated passing the upstream command.cfg to 
-    nagios' convertcfg, and then splitted up manually removing 
-    definitions already shipped with nagios. Thanks to Nate Allen 
+    These files are generated passing the upstream command.cfg to
+    nagios' convertcfg, and then splitted up manually removing
+    definitions already shipped with nagios. Thanks to Nate Allen
     who found out the solution. (closes: #232300)
 
  -- Guido Trotter <ultrotter at debian.org>  Sat, 14 Feb 2004 13:20:55 +0100


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: monitoring-plugins
 Section: net
-Priority: extra
+Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Jan Wagner <waja at cyconet.org>, Alexander Wirt <formorer at debian.org>
 Build-Depends: autotools-dev,
@@ -19,13 +19,11 @@ Build-Depends: autotools-dev,
 Homepage: https://www.monitoring-plugins.org
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins.git
-Standards-Version: 3.9.8
+Standards-Version: 4.1.4.0
 
 Package: monitoring-plugins
 Architecture: all
 Depends: monitoring-plugins-basic, monitoring-plugins-standard, ${misc:Depends}
-Replaces: nagios-plugins (<< 1.5-4~)
-Breaks: nagios-plugins (<< 1.5-4~)
 Suggests: icinga | icinga2, nagios-plugins-contrib
 Description: Plugins for nagios compatible monitoring systems (metapackage)
  Plugins for nagios compatible monitoring systems like Naemon and Icinga.
@@ -39,8 +37,6 @@ Description: Plugins for nagios compatible monitoring systems (metapackage)
 Package: monitoring-plugins-common
 Architecture: any
 Depends: ucf, ${misc:Depends}, ${shlibs:Depends}
-Replaces: nagios-plugins-common (<< 1.5-4~)
-Breaks: nagios-plugins-common (<< 1.5-4~)
 Suggests: icinga | icinga2
 Description: Common files for plugins for nagios compatible monitoring
  Common files for plugins for nagios compatible monitoring systems like Naemon
@@ -58,8 +54,6 @@ Depends: inetutils-ping (>= 2:1.9-1~) [kfreebsd-any hurd-any],
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libcap2-bin [linux-any]
-Replaces: nagios-plugins-basic (<< 1.5-4~)
-Breaks: nagios-plugins-basic (<< 1.5-4~)
 Suggests: icinga | icinga2
 Description: Plugins for nagios compatible monitoring systems (basic)
  Plugins for nagios compatible monitoring systems like Naemon and Icinga. It
@@ -85,8 +79,6 @@ Description: Plugins for nagios compatible monitoring systems (basic)
 
 Package: monitoring-plugins-standard
 Architecture: any
-Replaces: nagios-plugins-standard (<< 1.5-4~)
-Breaks: nagios-plugins-standard (<< 1.5-4~)
 Depends: monitoring-plugins-basic, ucf, ${misc:Depends}, ${shlibs:Depends}
 Recommends: bind9-host | host,
             dnsutils,
@@ -112,43 +104,3 @@ Description: Plugins for nagios compatible monitoring systems (standard)
  This package provides the suite of plugins that are most likely to be
  useful on a central monitoring host. Some scripts need more packages installed
  to work, which is implemented as recommends.
-
-Package: nagios-plugins
-Depends: monitoring-plugins, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package (nagios-plugins to monitoring-plugins)
- This dummy package is provided to support the transition from
- nagios-plugins to monitoring-plugins and should be removed afterwards.
-
-Package: nagios-plugins-common
-Architecture: all
-Section: oldlibs
-Depends: monitoring-plugins-common, ${misc:Depends}
-Replaces: nagios-plugins-basic (<= 1.4.15-5)
-Description: transitional dummy package
- This dummy package is provided to support the transition from
- nagios-plugins-common to monitoring-plugins-common and should be removed
- afterwards.
-
-Package: nagios-plugins-basic
-Depends: monitoring-plugins-basic, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Conflicts: nagios-plugins (<= 1.4.2-3)
-Replaces: nagios-plugins, nagios-plugins-standard
-Description: transitional dummy package
- This dummy package is provided to support the transition from
- nagios-plugins-basic to monitoring-plugins-basic and should be removed
- afterwards.
-
-Package: nagios-plugins-standard
-Depends: monitoring-plugins-standard, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Conflicts: nagios-plugins (<= 1.4.2-3)
-Replaces: nagios-plugins
-Description: transitional dummy package
- This dummy package is provided to support the transition from
- nagios-plugins-standard to monitoring-plugins-standard and should be removed
- afterwards.


=====================================
debian/functions
=====================================
--- a/debian/functions
+++ b/debian/functions
@@ -6,8 +6,8 @@ npconfdir=/etc/nagios-plugins/config
 register_cfgs(){
 		# do this in a subshell so we don't screw up cwd
 		( 
-			for f in *cfg; do
-				ucf ${templdir}/$f ${npconfdir}/$f
+			for file in ${templdir}/*cfg; do
+				ucf ${templdir}/$(basename $file) ${npconfdir}/$(basename $file)
 			done 
 		);
 }



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/compare/22de1396a3867de986968f75cf201c89b1676fab...95342bf76a2ab9c33ee234b5401252c02183ef6d

---
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/compare/22de1396a3867de986968f75cf201c89b1676fab...95342bf76a2ab9c33ee234b5401252c02183ef6d
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/20180513/0ec7409f/attachment-0001.html>

More information about the pkg-nagios-changes mailing list