New Version

2 files changed, 50 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a465b49e6c4d..d0cf67092331 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,15 +8,15 @@ pkgbase = ros-melodic-rospy
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-melodic-catkin
-	depends = ros-melodic-rosgraph
-	depends = ros-melodic-std-msgs
+	depends = ros-melodic-genpy
 	depends = ros-melodic-rosgraph-msgs
+	depends = ros-melodic-std-msgs
 	depends = ros-melodic-roscpp
+	depends = ros-melodic-rosgraph
 	depends = ros-melodic-roslib
-	depends = ros-melodic-genpy
+	depends = python-yaml
 	depends = python-rospkg
 	depends = python-numpy
-	depends = python-yaml
 	source = ros-melodic-rospy-1.14.3-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rospy/1.14.3-0.tar.gz
 	sha256sums = 3dbd699e3d8cea6b5fc18d98d184a1aedb4171a0eca3cd9ba280f320b3607468
 
diff --git a/PKGBUILD b/PKGBUILD
index cec6856d84a5..0c4a981955a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# 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 - rospy is a pure Python client library for ROS."
 url='http://ros.org/wiki/rospy'
 
@@ -10,58 +10,62 @@ arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
+ros_makedepends=(
+	ros-melodic-catkin
+)
 
-ros_depends=(ros-melodic-rosgraph
-  ros-melodic-std-msgs
-  ros-melodic-rosgraph-msgs
-  ros-melodic-roscpp
-  ros-melodic-roslib
-  ros-melodic-genpy)
-depends=(${ros_depends[@]}
-  python-rospkg
-  python-numpy
-  python-yaml)
+makedepends=(
+	'cmake'
+	'ros-build-tools'
+	${ros_makedepends[@]}
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/rospy/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+	ros-melodic-genpy
+	ros-melodic-rosgraph-msgs
+	ros-melodic-std-msgs
+	ros-melodic-roscpp
+	ros-melodic-rosgraph
+	ros-melodic-roslib
+)
+
+depends=(
+	${ros_depends[@]}
+	python-yaml
+	python-rospkg
+	python-numpy
+)
 
-# Tarball version (faster download)
 _dir="ros_comm-release-release-melodic-rospy-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rospy/${pkgver}-${_pkgver_patch}.tar.gz")
 sha256sums=('3dbd699e3d8cea6b5fc18d98d184a1aedb4171a0eca3cd9ba280f320b3607468')
 
 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
 }