New Version

2 files changed, 65 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dca75747702f..5f7bcf0c7cba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,29 @@
 pkgbase = ros-melodic-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 = 3
+	pkgrel = 1
 	url = http://ros.org/wiki/dynamic_reconfigure
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-cpp-common
-	makedepends = ros-melodic-roscpp-serialization
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-roscpp
 	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 = boost
+	depends = ros-melodic-rosservice
 	depends = ros-melodic-std-msgs
-	depends = ros-melodic-message-runtime
 	depends = ros-melodic-roscpp
-	depends = ros-melodic-roslib
-	depends = ros-melodic-rosservice
+	depends = ros-melodic-message-runtime
 	depends = ros-melodic-rospy
+	depends = ros-melodic-roslib
 	depends = boost
-	source = ros-melodic-dynamic-reconfigure-1.6.0-1.tar.gz::https://github.com/ros-gbp/dynamic_reconfigure-release/archive/release/melodic/dynamic_reconfigure/1.6.0-1.tar.gz
-	sha256sums = e711de2645ef008413203415d41b99a6b0209cd658693e40921175b11a84194e
+	source = ros-melodic-dynamic-reconfigure-1.6.0-0.tar.gz::https://github.com/ros-gbp/dynamic_reconfigure-release/archive/release/melodic/dynamic_reconfigure/1.6.0-0.tar.gz
+	sha256sums = 00811c7ff7a43ff5dc2d22ce9bb493e55728d403f49c359606e173b687872151
 
 pkgname = ros-melodic-dynamic-reconfigure
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b9573eee091..2343b8524d39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,76 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
 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='http://ros.org/wiki/dynamic_reconfigure'
 
 pkgname='ros-melodic-dynamic-reconfigure'
 pkgver='1.6.0'
-_pkgver_patch=1
+_pkgver_patch=0
 arch=('any')
-pkgrel=3
+pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-cpp-common
-  ros-melodic-roscpp-serialization
-  ros-melodic-std-msgs
-  ros-melodic-roscpp
-  ros-melodic-rostest
-  ros-melodic-catkin
-  ros-melodic-message-generation)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  boost)
+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_depends=(ros-melodic-std-msgs
-  ros-melodic-message-runtime
-  ros-melodic-roscpp
-  ros-melodic-roslib
-  ros-melodic-rosservice
-  ros-melodic-rospy)
-depends=(${ros_depends[@]}
-  boost)
+makedepends=(
+	'cmake'
+	'ros-build-tools'
+	${ros_makedepends[@]}
+	boost
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/dynamic_reconfigure/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/dynamic_reconfigure-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+	ros-melodic-rosservice
+	ros-melodic-std-msgs
+	ros-melodic-roscpp
+	ros-melodic-message-runtime
+	ros-melodic-rospy
+	ros-melodic-roslib
+)
 
-# Tarball version (faster download)
-_dir="dynamic_reconfigure-release-release-melodic-dynamic_reconfigure"
+depends=(
+	${ros_depends[@]}
+	boost
+)
+
+_dir="dynamic_reconfigure-release-release-melodic-dynamic_reconfigure-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/dynamic_reconfigure-release/archive/release/melodic/dynamic_reconfigure/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('e711de2645ef008413203415d41b99a6b0209cd658693e40921175b11a84194e')
+sha256sums=('00811c7ff7a43ff5dc2d22ce9bb493e55728d403f49c359606e173b687872151')
 
 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
+	# 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
 
-  # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+	# 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}
+	# Fix Python2/Python3 conflicts.
+	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
 
-  # Build project
-  cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-        -DPYTHON_BASENAME=.cpython-37m \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
+	# 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 \
+		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
+		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
+		-DPYTHON_BASENAME=.cpython-37m \
+		-DSETUPTOOLS_DEB_LAYOUT=OFF
+	make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}/" install
 }