Update to 1.15.2 and noetic

2 files changed, 36 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1c6722f1916..7100d815dbec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-ros
+pkgbase = ros-noetic-ros
 	pkgdesc = ROS - ROS packaging system.
-	pkgver = 1.14.6
-	pkgrel = 2
+	pkgver = 1.15.2
+	pkgrel = 1
 	url = https://www.wiki.ros.org/ROS
 	arch = i686
 	arch = x86_64
@@ -11,20 +11,20 @@ pkgbase = ros-melodic-ros
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-rosmake
-	depends = ros-melodic-rosboost-cfg
-	depends = ros-melodic-rosbuild
-	depends = ros-melodic-rosclean
-	depends = ros-melodic-rosbash
-	depends = ros-melodic-catkin
-	depends = ros-melodic-rosunit
-	depends = ros-melodic-mk
-	depends = ros-melodic-roscreate
-	depends = ros-melodic-roslang
-	depends = ros-melodic-roslib
-	source = ros-melodic-ros-1.14.6.tar.gz::https://github.com/ros/ros/archive/1.14.6.tar.gz
-	sha256sums = 62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-rosmake
+	depends = ros-noetic-rosboost-cfg
+	depends = ros-noetic-rosbuild
+	depends = ros-noetic-rosclean
+	depends = ros-noetic-rosbash
+	depends = ros-noetic-catkin
+	depends = ros-noetic-rosunit
+	depends = ros-noetic-mk
+	depends = ros-noetic-roscreate
+	depends = ros-noetic-roslang
+	depends = ros-noetic-roslib
+	source = ros-noetic-ros-1.15.2.tar.gz::https://github.com/ros/ros/archive/1.15.2.tar.gz
+	sha256sums = 596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e
 
-pkgname = ros-melodic-ros
+pkgname = ros-noetic-ros
 
diff --git a/PKGBUILD b/PKGBUILD
index aa637d0fc7e7..7125f65d86c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgdesc="ROS - ROS packaging system."
 url='https://www.wiki.ros.org/ROS'
 
-pkgname='ros-melodic-ros'
-pkgver='1.14.6'
+pkgname='ros-noetic-ros'
+pkgver='1.15.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -20,17 +20,17 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rosmake
-	ros-melodic-rosboost-cfg
-	ros-melodic-rosbuild
-	ros-melodic-rosclean
-	ros-melodic-rosbash
-	ros-melodic-catkin
-	ros-melodic-rosunit
-	ros-melodic-mk
-	ros-melodic-roscreate
-	ros-melodic-roslang
-	ros-melodic-roslib
+	ros-noetic-rosmake
+	ros-noetic-rosboost-cfg
+	ros-noetic-rosbuild
+	ros-noetic-rosclean
+	ros-noetic-rosbash
+	ros-noetic-catkin
+	ros-noetic-rosunit
+	ros-noetic-mk
+	ros-noetic-roscreate
+	ros-noetic-roslang
+	ros-noetic-roslib
 )
 
 depends=(
@@ -39,25 +39,22 @@ depends=(
 
 _dir="ros-${pkgver}/ros"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros/archive/${pkgver}.tar.gz")
-sha256sums=('62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c')
+sha256sums=('596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e')
 
 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