From 5518c1c923b101faf444ca817177ad4ba3a0f040 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 20 Aug 2021 12:36:55 +0100
Subject: [PATCH] d/rules: Normalize permissions of installed-tests

---
 debian/rules | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3f4dff89..4c5d26cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,11 +75,14 @@ override_dh_makeshlibs:
 	# this is an LD_PRELOAD, not a real shared library
 	dh_makeshlibs -Xinstalled-tests/ostree/libreaddir-rand.so
 
-override_dh_fixperms-arch:
-	# dh_fixperms assumes *.js are for browsers and makes them 0644.
-	dh_fixperms -X'*.js'
-	find debian/tmp -type f -name '*.js' -print0 | \
-		xargs -0r chmod -v go=rX,u+rw,a-s
+override_dh_fixperms:
+	dh_fixperms -Xusr/libexec/installed-tests
+ifneq ($(filter %-tests,$(binaries)),)
+	# debhelper >= 13.4 makes all of /usr/libexec executable, which is not
+	# quite right for installed-tests
+	chmod --changes u=rw,og=r debian/*-tests/usr/libexec/installed-tests/*/*.so
+	chmod --recursive --changes a+rX,u+w,og-w debian/*-tests/usr/libexec/installed-tests
+endif
 
 override_dh_installsystemd:
 	dh_installsystemd --no-start