Update to 1.15.4 and noetic

2 files changed, 50 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c90db17fd975..c8ce719004ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-rosbag
+pkgbase = ros-noetic-rosbag
 	pkgdesc = ROS - This is a set of tools for recording from and playing back to ROS topics.
-	pkgver = 1.14.3
-	pkgrel = 2
+	pkgver = 1.15.4
+	pkgrel = 1
 	url = https://wiki.ros.org/rosbag
 	arch = i686
 	arch = x86_64
@@ -11,33 +11,33 @@ pkgbase = ros-melodic-rosbag
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-std-srvs
-	makedepends = ros-melodic-xmlrpcpp
-	makedepends = ros-melodic-rosbag-storage
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-cpp-common
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-roscpp-serialization
-	makedepends = ros-melodic-topic-tools
+	makedepends = ros-noetic-std-srvs
+	makedepends = ros-noetic-xmlrpcpp
+	makedepends = ros-noetic-rosbag-storage
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-cpp-common
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-roscpp-serialization
+	makedepends = ros-noetic-topic-tools
 	makedepends = python-pillow
 	makedepends = boost
-	depends = ros-melodic-std-srvs
-	depends = ros-melodic-xmlrpcpp
-	depends = ros-melodic-rosbag-storage
-	depends = ros-melodic-genpy
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-topic-tools
-	depends = ros-melodic-rospy
-	depends = ros-melodic-genmsg
-	depends = ros-melodic-roslib
+	depends = ros-noetic-std-srvs
+	depends = ros-noetic-xmlrpcpp
+	depends = ros-noetic-rosbag-storage
+	depends = ros-noetic-genpy
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-topic-tools
+	depends = ros-noetic-rospy
+	depends = ros-noetic-genmsg
+	depends = ros-noetic-roslib
 	depends = python-rospkg
 	depends = boost
 	depends = python-gnupg
 	depends = python-crypto
-	source = ros-melodic-rosbag-1.14.3.tar.gz::https://github.com/ros/ros_comm/archive/1.14.3.tar.gz
-	sha256sums = 3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f
+	source = ros-noetic-rosbag-1.15.4.tar.gz::https://github.com/ros/ros_comm/archive/1.15.4.tar.gz
+	sha256sums = d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e
 
-pkgname = ros-melodic-rosbag
+pkgname = ros-noetic-rosbag
 
diff --git a/PKGBUILD b/PKGBUILD
index 7ee410f797f1..9e9cf5cffaa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,22 @@
 pkgdesc="ROS - This is a set of tools for recording from and playing back to ROS topics."
 url='https://wiki.ros.org/rosbag'
 
-pkgname='ros-melodic-rosbag'
-pkgver='1.14.3'
+pkgname='ros-noetic-rosbag'
+pkgver='1.15.4'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-std-srvs
-	ros-melodic-xmlrpcpp
-	ros-melodic-rosbag-storage
-	ros-melodic-catkin
-	ros-melodic-cpp-common
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-roscpp-serialization
-	ros-melodic-topic-tools
+	ros-noetic-std-srvs
+	ros-noetic-xmlrpcpp
+	ros-noetic-rosbag-storage
+	ros-noetic-catkin
+	ros-noetic-cpp-common
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-roscpp-serialization
+	ros-noetic-topic-tools
 )
 
 makedepends=(
@@ -30,16 +30,16 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-std-srvs
-	ros-melodic-xmlrpcpp
-	ros-melodic-rosbag-storage
-	ros-melodic-genpy
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-topic-tools
-	ros-melodic-rospy
-	ros-melodic-genmsg
-	ros-melodic-roslib
+	ros-noetic-std-srvs
+	ros-noetic-xmlrpcpp
+	ros-noetic-rosbag-storage
+	ros-noetic-genpy
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-topic-tools
+	ros-noetic-rospy
+	ros-noetic-genmsg
+	ros-noetic-roslib
 )
 
 depends=(
@@ -52,25 +52,22 @@ depends=(
 
 _dir="ros_comm-${pkgver}/tools/rosbag"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
-sha256sums=('3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f')
+sha256sums=('d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e')
 
 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