upd to noetic, cmake vars, python

2 files changed, 43 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 928a87ae1012..b5ca039acbda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-laser-assembler
+pkgbase = ros-noetic-laser-assembler
 	pkgdesc = ROS - Provides nodes to assemble point clouds from either LaserScan or PointCloud messages.
 	pkgver = 1.7.6
 	pkgrel = 3
@@ -11,28 +11,28 @@ pkgbase = ros-melodic-laser-assembler
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-filters
-	makedepends = ros-melodic-laser-geometry
-	makedepends = ros-melodic-rostest
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-message-filters
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-pluginlib
-	depends = ros-melodic-filters
-	depends = ros-melodic-laser-geometry
-	depends = ros-melodic-message-filters
-	depends = ros-melodic-tf
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-pluginlib
-	source = ros-melodic-laser-assembler-1.7.6.tar.gz::https://github.com/ros-perception/laser_assembler/archive/1.7.6.tar.gz
+	makedepends = ros-noetic-filters
+	makedepends = ros-noetic-laser-geometry
+	makedepends = ros-noetic-rostest
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-message-filters
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-pluginlib
+	depends = ros-noetic-filters
+	depends = ros-noetic-laser-geometry
+	depends = ros-noetic-message-filters
+	depends = ros-noetic-tf
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-pluginlib
+	source = ros-noetic-laser-assembler-1.7.6.tar.gz::https://github.com/ros-perception/laser_assembler/archive/1.7.6.tar.gz
 	source = CMakeLists-signal.patch
 	sha256sums = f9b5c23f7eac7406dd3d0e4a095864335b18a25611fd28f3279763339d7bd94f
 	sha256sums = 1c050096b3e5edf41da7ef88db915f5690f5b6903e7d46c65a1655204f49039c
 
-pkgname = ros-melodic-laser-assembler
+pkgname = ros-noetic-laser-assembler
 
diff --git a/PKGBUILD b/PKGBUILD
index 527389222465..f7dfb8337b79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,23 @@
 pkgdesc="ROS - Provides nodes to assemble point clouds from either LaserScan or PointCloud messages."
 url='https://wiki.ros.org/laser_assembler'
 
-pkgname='ros-melodic-laser-assembler'
+pkgname='ros-noetic-laser-assembler'
 pkgver='1.7.6'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-filters
-	ros-melodic-laser-geometry
-	ros-melodic-rostest
-	ros-melodic-catkin
-	ros-melodic-tf
-	ros-melodic-message-generation
-	ros-melodic-roscpp
-	ros-melodic-message-filters
-	ros-melodic-sensor-msgs
-	ros-melodic-pluginlib
+	ros-noetic-filters
+	ros-noetic-laser-geometry
+	ros-noetic-rostest
+	ros-noetic-catkin
+	ros-noetic-tf
+	ros-noetic-message-generation
+	ros-noetic-roscpp
+	ros-noetic-message-filters
+	ros-noetic-sensor-msgs
+	ros-noetic-pluginlib
 )
 
 makedepends=(
@@ -29,14 +29,14 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-filters
-	ros-melodic-laser-geometry
-	ros-melodic-message-filters
-	ros-melodic-tf
-	ros-melodic-roscpp
-	ros-melodic-message-runtime
-	ros-melodic-sensor-msgs
-	ros-melodic-pluginlib
+	ros-noetic-filters
+	ros-noetic-laser-geometry
+	ros-noetic-message-filters
+	ros-noetic-tf
+	ros-noetic-roscpp
+	ros-noetic-message-runtime
+	ros-noetic-sensor-msgs
+	ros-noetic-pluginlib
 )
 
 depends=(
@@ -57,21 +57,17 @@ prepare() {
 build() {
 	# Use ROS environment variables.
 	source /usr/share/ros-build-tools/clear-ros-env.sh
-	[ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+	[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
 	# Create the build directory.
 	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
 	cd ${srcdir}/build
 
-	# Fix Python2/Python3 conflicts.
-	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }