diff -Nru nsca-ng-1.5/debian/changelog nsca-ng-1.5/debian/changelog --- nsca-ng-1.5/debian/changelog 2016-12-03 20:57:17.000000000 +0000 +++ nsca-ng-1.5/debian/changelog 2016-12-16 17:14:22.000000000 +0000 @@ -1,3 +1,25 @@ +nsca-ng (1.5-2) unstable; urgency=medium + + * Team upload. + * Add Vcs-* fields to control file. + * Change Maintainer to Debian Nagios Maintainer Group, + move Alexander Wirt to Uploaders. + * Update watch file to handle common issues. + * Restructure control file with cme. + * Update copyright file, changes: + - Use standalong license paragraph + - Update Format URL to use HTTPS + - Fix case for Upstream-Name + * Drop duplicate Section from control file. + * Enable all hardening buildflags. + * Add lsb-base dependency for nsca-ng-server init script. + * Change Conflicts with version to Breaks/Replaces. + * Update nsca-ng-server init script to also provide itself. + * Add lintian override for manpage-has-errors-from-man. + * Bump Standards-Version to 3.9.8, no changes. + + -- Bas Couwenberg Fri, 16 Dec 2016 18:14:22 +0100 + nsca-ng (1.5-1) unstable; urgency=medium * [a040168] Use Icinga instead of Nagios (nagios3 removed from Debian). diff -Nru nsca-ng-1.5/debian/control nsca-ng-1.5/debian/control --- nsca-ng-1.5/debian/control 2016-12-03 20:55:57.000000000 +0000 +++ nsca-ng-1.5/debian/control 2016-12-16 17:14:08.000000000 +0000 @@ -1,7 +1,8 @@ Source: nsca-ng +Maintainer: Debian Nagios Maintainer Group +Uploaders: Alexander Wirt Section: net Priority: extra -Maintainer: Alexander Wirt Build-Depends: autotools-dev, debhelper (>= 9), dh-autoreconf, @@ -11,13 +12,18 @@ libbsd-dev, libssl-dev, libsystemd-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nagios/pkg-nsca-ng.git +Vcs-Git: https://anonscm.debian.org/git/pkg-nagios/pkg-nsca-ng.git Homepage: http://www.nsca-ng.org/ Package: nsca-ng-client Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: nsca (<< 2.9.1-1), nsca-client +Depends: ${misc:Depends}, + ${shlibs:Depends} +Breaks: nsca (<< 2.9.1-1) +Conflicts: nsca-client +Replaces: nsca (<< 2.9.1-1) Description: Send monitoring commands to NSCA-ng server The send_nsca utility transmits one or more check results or monitoring commands to an NSCA-ng server. @@ -27,8 +33,10 @@ Package: nsca-ng-server Architecture: any -Section: net -Depends: adduser, ${misc:Depends}, ${shlibs:Depends} +Depends: adduser, + lsb-base, + ${misc:Depends}, + ${shlibs:Depends} Recommends: icinga-core Description: Monitoring command acceptor The NSCA-ng server makes the Icinga command file accessible from remote diff -Nru nsca-ng-1.5/debian/copyright nsca-ng-1.5/debian/copyright --- nsca-ng-1.5/debian/copyright 2013-03-16 10:12:01.000000000 +0000 +++ nsca-ng-1.5/debian/copyright 2016-12-16 16:58:45.000000000 +0000 @@ -1,36 +1,16 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: nsca-ng +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: NSCA-ng Source: http://nsca-ng.org Files: * Copyright: Copyright 2013 Holger Weiss License: BSD-2-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - . - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: debian/* Copyright: 2013 Alexander Wirt License: BSD-2-clause + +License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff -Nru nsca-ng-1.5/debian/nsca-ng-server.init nsca-ng-1.5/debian/nsca-ng-server.init --- nsca-ng-1.5/debian/nsca-ng-server.init 2016-12-03 20:50:20.000000000 +0000 +++ nsca-ng-1.5/debian/nsca-ng-server.init 2016-12-16 17:06:59.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: nsca-ng +# Provides: nsca-ng nsca-ng-server # Required-Start: $remote_fs $network $syslog # Required-Stop: $remote_fs $network $syslog # Should-Start: $named icinga diff -Nru nsca-ng-1.5/debian/nsca-ng-server.lintian-overrides nsca-ng-1.5/debian/nsca-ng-server.lintian-overrides --- nsca-ng-1.5/debian/nsca-ng-server.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ nsca-ng-1.5/debian/nsca-ng-server.lintian-overrides 2016-12-16 17:10:05.000000000 +0000 @@ -0,0 +1,3 @@ +# False positive on long line +nsca-ng-server: manpage-has-errors-from-man usr/share/man/man5/nsca-ng.cfg.5.gz *: cannot adjust line + diff -Nru nsca-ng-1.5/debian/rules nsca-ng-1.5/debian/rules --- nsca-ng-1.5/debian/rules 2015-06-19 11:57:54.000000000 +0000 +++ nsca-ng-1.5/debian/rules 2016-12-16 17:03:44.000000000 +0000 @@ -9,6 +9,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# Enable hardening build flags +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + %: dh $@ --with autotools-dev,autoreconf,systemd diff -Nru nsca-ng-1.5/debian/watch nsca-ng-1.5/debian/watch --- nsca-ng-1.5/debian/watch 2013-03-16 10:12:01.000000000 +0000 +++ nsca-ng-1.5/debian/watch 2016-12-16 16:54:05.000000000 +0000 @@ -1,4 +1,6 @@ -# format version number, currently 3; this line is compulsory! version=3 - -http://www.nsca-ng.org/download/nsca-ng-([\d\.]+)\.tar\.gz \ No newline at end of file +opts=\ +dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/-/./g \ +http://www.nsca-ng.org/download/ \ +nsca-ng-([\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))