upd to noetic, cmake vars, python

2 files changed, 43 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac0a29cd462f..4ea319163bb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-laser-filters
+pkgbase = ros-noetic-laser-filters
 	pkgdesc = ROS - Assorted filters designed to operate on 2D planar laser scanners, which use the sensor_msgs/LaserScan type.
 	pkgver = 1.8.6
 	pkgrel = 3
@@ -11,28 +11,28 @@ pkgbase = ros-melodic-laser-filters
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-filters
-	makedepends = ros-melodic-laser-geometry
-	makedepends = ros-melodic-angles
-	makedepends = ros-melodic-rostest
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf
-	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-angles
-	depends = ros-melodic-tf
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-message-filters
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-pluginlib
-	source = ros-melodic-laser-filters-1.8.6.tar.gz::https://github.com/ros-perception/laser_filters/archive/1.8.6.tar.gz
+	makedepends = ros-noetic-filters
+	makedepends = ros-noetic-laser-geometry
+	makedepends = ros-noetic-angles
+	makedepends = ros-noetic-rostest
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-tf
+	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-angles
+	depends = ros-noetic-tf
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-message-filters
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-pluginlib
+	source = ros-noetic-laser-filters-1.8.6.tar.gz::https://github.com/ros-perception/laser_filters/archive/1.8.6.tar.gz
 	source = CMakeLists-signal.patch
 	sha256sums = c9678edee036ddb42a2dea1e71609763b44d6d1618fe384b204f3caa7d77ea3d
 	sha256sums = bf96a9ab678f7811ba2d99cb07e0eaaa0a7c03f5604878970ba3acda18931a3c
 
-pkgname = ros-melodic-laser-filters
+pkgname = ros-noetic-laser-filters
 
diff --git a/PKGBUILD b/PKGBUILD
index c291e46f71c6..e578ae0a8729 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,23 @@
 pkgdesc="ROS - Assorted filters designed to operate on 2D planar laser scanners, which use the sensor_msgs/LaserScan type."
 url='https://wiki.ros.org/laser_filters'
 
-pkgname='ros-melodic-laser-filters'
+pkgname='ros-noetic-laser-filters'
 pkgver='1.8.6'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-filters
-	ros-melodic-laser-geometry
-	ros-melodic-angles
-	ros-melodic-rostest
-	ros-melodic-catkin
-	ros-melodic-tf
-	ros-melodic-roscpp
-	ros-melodic-message-filters
-	ros-melodic-sensor-msgs
-	ros-melodic-pluginlib
+	ros-noetic-filters
+	ros-noetic-laser-geometry
+	ros-noetic-angles
+	ros-noetic-rostest
+	ros-noetic-catkin
+	ros-noetic-tf
+	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-angles
-	ros-melodic-tf
-	ros-melodic-roscpp
-	ros-melodic-message-filters
-	ros-melodic-sensor-msgs
-	ros-melodic-pluginlib
+	ros-noetic-filters
+	ros-noetic-laser-geometry
+	ros-noetic-angles
+	ros-noetic-tf
+	ros-noetic-roscpp
+	ros-noetic-message-filters
+	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
 }