Update to noetic and 1.7.0

2 files changed, 38 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9687f0d49085..14d7b8a4b6ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-dynamic-reconfigure
+pkgbase = ros-noetic-dynamic-reconfigure
 	pkgdesc = ROS - This unary stack contains the dynamic_reconfigure package which provides a means to change node parameters at any time without having to restart the node.
-	pkgver = 1.6.0
-	pkgrel = 2
+	pkgver = 1.7.0
+	pkgrel = 1
 	url = https://wiki.ros.org/dynamic_reconfigure
 	arch = i686
 	arch = x86_64
@@ -11,23 +11,23 @@ pkgbase = ros-melodic-dynamic-reconfigure
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-rostest
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-cpp-common
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-roscpp-serialization
+	makedepends = ros-noetic-rostest
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-cpp-common
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-roscpp-serialization
 	makedepends = boost
-	depends = ros-melodic-rosservice
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-rospy
-	depends = ros-melodic-roslib
+	depends = ros-noetic-rosservice
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-rospy
+	depends = ros-noetic-roslib
 	depends = boost
-	source = ros-melodic-dynamic-reconfigure-1.6.0.tar.gz::https://github.com/ros/dynamic_reconfigure/archive/1.6.0.tar.gz
-	sha256sums = 8dad5836e6844f1ab76b1b155a9ec3f34bdaa7a5c629d6197b85c96812d8bca6
+	source = ros-noetic-dynamic-reconfigure-1.7.0.tar.gz::https://github.com/ros/dynamic_reconfigure/archive/1.7.0.tar.gz
+	sha256sums = 0264fb132be6545ce013fa9e0123aeb2bcdd1e77fdef37691f4fdb8053100951
 
-pkgname = ros-melodic-dynamic-reconfigure
+pkgname = ros-noetic-dynamic-reconfigure
 
diff --git a/PKGBUILD b/PKGBUILD
index 022b8ff53668..74f27c711ad3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,20 @@
 pkgdesc="ROS - This unary stack contains the dynamic_reconfigure package which provides a means to change node parameters at any time without having to restart the node."
 url='https://wiki.ros.org/dynamic_reconfigure'
 
-pkgname='ros-melodic-dynamic-reconfigure'
-pkgver='1.6.0'
+pkgname='ros-noetic-dynamic-reconfigure'
+pkgver='1.7.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-rostest
-	ros-melodic-catkin
-	ros-melodic-message-generation
-	ros-melodic-cpp-common
-	ros-melodic-std-msgs
-	ros-melodic-roscpp
-	ros-melodic-roscpp-serialization
+	ros-noetic-rostest
+	ros-noetic-catkin
+	ros-noetic-message-generation
+	ros-noetic-cpp-common
+	ros-noetic-std-msgs
+	ros-noetic-roscpp
+	ros-noetic-roscpp-serialization
 )
 
 makedepends=(
@@ -27,12 +27,12 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rosservice
-	ros-melodic-std-msgs
-	ros-melodic-roscpp
-	ros-melodic-message-runtime
-	ros-melodic-rospy
-	ros-melodic-roslib
+	ros-noetic-rosservice
+	ros-noetic-std-msgs
+	ros-noetic-roscpp
+	ros-noetic-message-runtime
+	ros-noetic-rospy
+	ros-noetic-roslib
 )
 
 depends=(
@@ -42,25 +42,22 @@ depends=(
 
 _dir="dynamic_reconfigure-${pkgver}"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/dynamic_reconfigure/archive/${pkgver}.tar.gz")
-sha256sums=('8dad5836e6844f1ab76b1b155a9ec3f34bdaa7a5c629d6197b85c96812d8bca6')
+sha256sums=('0264fb132be6545ce013fa9e0123aeb2bcdd1e77fdef37691f4fdb8053100951')
 
 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