Control: tags -1 patch On 11/5/22 21:04, Bas Couwenberg wrote:
python3-setuptools no longer defaults to --install-layout=deb, sumo will need a patch to add this to the generated setup.py.
The attached patch resolves this issue. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
diff -Nru sumo-1.12.0+dfsg1/debian/changelog sumo-1.12.0+dfsg1/debian/changelog --- sumo-1.12.0+dfsg1/debian/changelog 2022-02-11 22:11:11.000000000 +0000 +++ sumo-1.12.0+dfsg1/debian/changelog 2022-11-11 13:28:30.000000000 +0000 @@ -1,3 +1,11 @@ +sumo (1.12.0+dfsg1-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Add patch to fix installation with setuptools 65.3.0. + (closes: #1023520) + + -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 11 Nov 2022 13:28:30 +0000 + sumo (1.12.0+dfsg1-1) unstable; urgency=medium * [e174ad9] Fix typo diff -Nru sumo-1.12.0+dfsg1/debian/patches/series sumo-1.12.0+dfsg1/debian/patches/series --- sumo-1.12.0+dfsg1/debian/patches/series 2022-02-11 22:11:11.000000000 +0000 +++ sumo-1.12.0+dfsg1/debian/patches/series 2022-11-11 13:27:39.000000000 +0000 @@ -1,3 +1,4 @@ 50_python2-rm.patch 60_fix_tests.patch 10_fix_python2.patch +setuptools.patch diff -Nru sumo-1.12.0+dfsg1/debian/patches/setuptools.patch sumo-1.12.0+dfsg1/debian/patches/setuptools.patch --- sumo-1.12.0+dfsg1/debian/patches/setuptools.patch 1970-01-01 00:00:00.000000000 +0000 +++ sumo-1.12.0+dfsg1/debian/patches/setuptools.patch 2022-11-11 13:27:39.000000000 +0000 @@ -0,0 +1,47 @@ +Description: Fix installation with setuptools 65.3.0. +Author: Bas Couwenberg <sebas...@debian.org> +Bug-Debian: https://bugs.debian.org/1023520 +Forwarded: not-needed + +Index: sumo-1.12.0+dfsg1/src/libsumo/CMakeLists.txt +=================================================================== +--- sumo-1.12.0+dfsg1.orig/src/libsumo/CMakeLists.txt ++++ sumo-1.12.0+dfsg1/src/libsumo/CMakeLists.txt +@@ -187,7 +187,7 @@ if(SWIG_FOUND) + endif() + if (NOT ${SETUPTOOLS_MISSING}) + install( +- CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-libsumo.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" ++ CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-libsumo.py clean --all install --install-layout=deb --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" + COMPONENT pylibsumo) + endif() + else() +Index: sumo-1.12.0+dfsg1/src/libtraci/CMakeLists.txt +=================================================================== +--- sumo-1.12.0+dfsg1.orig/src/libtraci/CMakeLists.txt ++++ sumo-1.12.0+dfsg1/src/libtraci/CMakeLists.txt +@@ -159,7 +159,7 @@ if(SWIG_FOUND) + endif() + if (NOT ${SETUPTOOLS_MISSING}) + install( +- CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-libtraci.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" ++ CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-libtraci.py clean --all install --install-layout=deb --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" + COMPONENT pylibtraci) + endif() + else() +Index: sumo-1.12.0+dfsg1/CMakeLists.txt +=================================================================== +--- sumo-1.12.0+dfsg1.orig/CMakeLists.txt ++++ sumo-1.12.0+dfsg1/CMakeLists.txt +@@ -456,9 +456,9 @@ endif () + install(EXPORT SUMOConfig DESTINATION ${DATA_PATH}cmake NAMESPACE SUMO::) + + if (NOT ${SETUPTOOLS_MISSING}) +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-sumolib.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-sumolib.py clean --all install --install-layout=deb --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" + COMPONENT pysumolib) +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-traci.py clean --all install --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/setup-traci.py clean --all install --install-layout=deb --root=\$ENV{DESTDIR}/ --prefix=${CMAKE_INSTALL_PREFIX} --optimize=1)" + COMPONENT pytraci) + endif () +
