From 9249420cad046729a33c2325de9b33b0bda7510a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 14 Nov 2024 14:22:25 -0800 Subject: [PATCH] Revert "setuptools --install-layout argument is no longer supported..." This is creating trouble during tests. Scripts are being installed to usr/local/bin instead of usr/bin and aside from the fact that this is tripping up the dh_usrlocal helper it is incorrect. This reverts commit f8c8b159805181b4423593280a7bc28f89c77ca8. --- stdeb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb/util.py b/stdeb/util.py index 5d073ac..61b1343 100644 --- a/stdeb/util.py +++ b/stdeb/util.py @@ -1680,7 +1680,7 @@ def build_dsc(debinfo, RULES_OVERRIDE_INSTALL_TARGET_PY2 = " %(python2_binname)s setup.py install --force --root=debian/%(package)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python2_scripts_cli_args)s" # noqa: E501 -RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 %(install_prefix)s %(no_python3_scripts_cli_args)s" # noqa: E501 +RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python3_scripts_cli_args)s" # noqa: E501 RULES_OVERRIDE_INSTALL_TARGET = """ override_dh_auto_install: