diff -Nru nsca-ng-1.6/debian/changelog nsca-ng-1.6/debian/changelog
--- nsca-ng-1.6/debian/changelog	2021-11-24 09:20:08.000000000 +0000
+++ nsca-ng-1.6/debian/changelog	2022-05-14 05:51:47.000000000 +0000
@@ -1,8 +1,19 @@
-nsca-ng (1.6-4build1) jammy; urgency=medium
+nsca-ng (1.6-5) unstable; urgency=medium
 
-  * No-change rebuild against openssl3
+  * Team upload.
 
- -- Simon Chopin <simon.chopin@canonical.com>  Wed, 24 Nov 2021 10:20:08 +0100
+  [ Bas Couwenberg ]
+  * Bump Standards-Version to 4.6.0, no changes.
+  * Update watch file for GitHub URL changes.
+  * Add upstream patch to close FIFO in test_nsca.
+  * Disable parallel tests.
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster:
+    + nsca-ng-client: Drop versioned constraint on nsca in Replaces.
+    + nsca-ng-client: Drop versioned constraint on nsca in Breaks.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 14 May 2022 07:51:47 +0200
 
 nsca-ng (1.6-4) unstable; urgency=medium
 
diff -Nru nsca-ng-1.6/debian/control nsca-ng-1.6/debian/control
--- nsca-ng-1.6/debian/control	2020-11-20 10:05:02.000000000 +0000
+++ nsca-ng-1.6/debian/control	2021-09-08 15:57:12.000000000 +0000
@@ -9,7 +9,7 @@
                libbsd-dev,
                libssl-dev,
                libsystemd-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-nsca-ng
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-nsca-ng.git
 Homepage: https://github.com/weiss/nsca-ng
@@ -18,9 +18,7 @@
 Architecture: any
 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.
diff -Nru nsca-ng-1.6/debian/patches/0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch nsca-ng-1.6/debian/patches/0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch
--- nsca-ng-1.6/debian/patches/0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch	1970-01-01 00:00:00.000000000 +0000
+++ nsca-ng-1.6/debian/patches/0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch	2022-05-14 05:40:11.000000000 +0000
@@ -0,0 +1,28 @@
+Description: tests/test_nsca.c: Don't forget to close FIFO
+ Discovered by Coverity Scan.
+From: Holger Weiß <holger@weiss.in-berlin.de>
+Origin: https://github.com/weiss/nsca-ng/commit/11b42fa5d75f58b1e6c6ac5687e38eff18380903
+Forwarded: not-needed
+
+--- a/tests/test_nsca.c
++++ b/tests/test_nsca.c
+@@ -242,7 +242,7 @@ static void
+ cat_fifo(long n_lines)
+ {
+ 	FILE *fifo;
+-	int c;
++	int c, error;
+ 	enum {
+ 		STATE_EAT_TIMESTAMP,
+ 		STATE_PRINT_COMMAND
+@@ -271,7 +271,9 @@ cat_fifo(long n_lines)
+ 			}
+ 		}
+ 	}
+-	if (ferror(fifo))
++	error = ferror(fifo);
++	(void)close(fifo);
++	if (error)
+ 		die("Cannot read %s: %s", COMMAND_FILE,
+ 		    got_signal ? "Interrupted" : strerror(errno));
+ }
diff -Nru nsca-ng-1.6/debian/patches/series nsca-ng-1.6/debian/patches/series
--- nsca-ng-1.6/debian/patches/series	2019-03-23 18:06:48.000000000 +0000
+++ nsca-ng-1.6/debian/patches/series	2022-05-14 05:39:02.000000000 +0000
@@ -1 +1,2 @@
 nsca-ng.cfg_debian_config
+0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch
diff -Nru nsca-ng-1.6/debian/rules nsca-ng-1.6/debian/rules
--- nsca-ng-1.6/debian/rules	2020-11-20 10:05:02.000000000 +0000
+++ nsca-ng-1.6/debian/rules	2022-05-14 05:47:52.000000000 +0000
@@ -22,6 +22,9 @@
 override_dh_auto_configure:
 	dh_auto_configure  -- --enable-server
 
+override_dh_auto_test:
+	dh_auto_test --no-parallel
+
 override_dh_auto_install:
 	dh_auto_install
 
diff -Nru nsca-ng-1.6/debian/watch nsca-ng-1.6/debian/watch
--- nsca-ng-1.6/debian/watch	2020-11-06 19:07:44.000000000 +0000
+++ nsca-ng-1.6/debian/watch	2021-10-23 17:33:38.000000000 +0000
@@ -3,5 +3,5 @@
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
 filenamemangle=s/(?:.*\/)?(?:rel|v|nsca-ng)[\-\_]?(\d[\d\-\.]+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/nsca-ng-$1.$2/ \
-https://github.com/weiss/nsca-ng/releases \
-(?:.*?/archive/)?(?:rel|v|nsca-ng)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+https://github.com/weiss/nsca-ng/tags \
+(?:.*?/archive/(?:.*?/)?)?(?:rel|v|nsca-ng)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))