Update to noetic

2 files changed, 20 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99614ed35d42..9d6aaecb4691 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
-pkgbase = ros-melodic-actionlib-msgs
+pkgbase = ros-noetic-actionlib-msgs
 	pkgdesc = ROS - actionlib_msgs defines the common messages to interact with an action server and an action client.
 	pkgver = 1.12.7
-	pkgrel = 3
+	pkgrel = 1
 	url = https://wiki.ros.org/actionlib_msgs
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-message-generation
-	depends = ros-melodic-std-msgs
-	source = ros-melodic-actionlib-msgs-1.12.7.tar.gz::https://github.com/ros/common_msgs/archive/1.12.7.tar.gz
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-message-generation
+	depends = ros-noetic-std-msgs
+	source = ros-noetic-actionlib-msgs-1.12.7.tar.gz::https://github.com/ros/common_msgs/archive/1.12.7.tar.gz
 	sha256sums = a9d8c7655d426afe8bc2b021e0bc8ce25dae70ca35b985a0ec0b8b5768722bd4
 
-pkgname = ros-melodic-actionlib-msgs
+pkgname = ros-noetic-actionlib-msgs
 
diff --git a/PKGBUILD b/PKGBUILD
index 5541a43a8867..c51cf8120535 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@
 pkgdesc="ROS - actionlib_msgs defines the common messages to interact with an action server and an action client."
 url='https://wiki.ros.org/actionlib_msgs'
 
-pkgname='ros-melodic-actionlib-msgs'
+pkgname='ros-noetic-actionlib-msgs'
 pkgver='1.12.7'
 arch=('any')
-pkgrel=3
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-message-generation
-	ros-melodic-std-msgs
-	ros-melodic-catkin
+	ros-noetic-message-generation
+	ros-noetic-std-msgs
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -22,9 +22,9 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-message-runtime
-	ros-melodic-message-generation
-	ros-melodic-std-msgs
+	ros-noetic-message-runtime
+	ros-noetic-message-generation
+	ros-noetic-std-msgs
 )
 
 depends=(
@@ -38,20 +38,17 @@ sha256sums=('a9d8c7655d426afe8bc2b021e0bc8ce25dae70ca35b985a0ec0b8b5768722bd4')
 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 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make