Merge pull request #6 from Greenzie/seebq/attempt-fix-for-setuptools

Attempt fix for SETUPTOOLS
Greenzie · Jul 17, 2023 · b9f9942 · b9f9942
2 parents 45fe868 + 262372d
commit b9f9942
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package greenzie_ntrip_client
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.4 (2023-07-17)
+------------------
+* Fixed Bug with Building Python Debian
+
 1.2.3 (2023-06-26)
 ------------------
 * Changed the default NMEA Max Message Length to 84

diff --git a/debian/rules b/debian/rules
@@ -14,6 +14,8 @@ export DH_VERBOSE=1
 #  https://code.ros.org/trac/ros/ticket/3842
 export LDFLAGS=
 export PKG_CONFIG_PATH=/opt/ros/noetic/lib/pkgconfig
+# added to attempt to fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003252
+export SETUPTOOLS_USE_DISTUTILS=stdlib
 # Explicitly enable -DNDEBUG, see:
 # 	https://github.com/ros-infrastructure/bloom/issues/327
 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG
@@ -34,8 +36,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCATKIN_BUILD_BINARY_PACKAGE="1" \
 		-DCMAKE_INSTALL_PREFIX="/opt/ros/noetic" \
-		-DCMAKE_PREFIX_PATH="/opt/ros/noetic" \
-                -DSETUPTOOLS_DEB_LAYOUT=OFF \
+		-DCMAKE_PREFIX_PATH="/opt/ros/noetic"
 		$(BUILD_TESTING_ARG)
 
 override_dh_auto_build: