New Version

2 files changed, 49 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93a24ebf5cba..2d45bd7c2301 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = ros-melodic-tf2-py
 	pkgdesc = ROS - The tf2_py package.
-	pkgver = 0.6.3
-	pkgrel = 2
+	pkgver = 0.6.5
+	pkgrel = 1
 	url = http://ros.org/wiki/tf2_py
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-melodic-tf2
-	makedepends = ros-melodic-catkin
 	makedepends = ros-melodic-rospy
+	makedepends = ros-melodic-catkin
 	depends = ros-melodic-tf2
 	depends = ros-melodic-rospy
-	source = ros-melodic-tf2-py-0.6.3-0.tar.gz::https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_py/0.6.3-0.tar.gz
-	sha256sums = 8c5739e5bc4494db19282193409ee9a1a73a3a2c4a67bc8785e7c2d79f3468f4
+	source = ros-melodic-tf2-py-0.6.5-0.tar.gz::https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_py/0.6.5-0.tar.gz
+	sha256sums = 24fc32a89eb1f6714d2f05c138c5d85741aabe819fc18475e63564aa0e2c388b
 
 pkgname = ros-melodic-tf2-py
 
diff --git a/PKGBUILD b/PKGBUILD
index 4f9e8d17d8d6..9fa77b57c756 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,66 @@
-# 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 - The tf2_py package."
 url='http://ros.org/wiki/tf2_py'
 
 pkgname='ros-melodic-tf2-py'
-pkgver='0.6.3'
+pkgver='0.6.5'
 _pkgver_patch=0
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-tf2
-  ros-melodic-catkin
-  ros-melodic-rospy)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
+ros_makedepends=(
+	ros-melodic-tf2
+	ros-melodic-rospy
+	ros-melodic-catkin
+)
 
-ros_depends=(ros-melodic-tf2
-  ros-melodic-rospy)
-depends=(${ros_depends[@]})
+makedepends=(
+	'cmake'
+	'ros-build-tools'
+	${ros_makedepends[@]}
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/tf2_py/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/geometry2-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+	ros-melodic-tf2
+	ros-melodic-rospy
+)
+
+depends=(
+	${ros_depends[@]}
+)
 
-# Tarball version (faster download)
 _dir="geometry2-release-release-melodic-tf2_py-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_py/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('8c5739e5bc4494db19282193409ee9a1a73a3a2c4a67bc8785e7c2d79f3468f4')
-
-prepare() {
-  # Python3.7 compatibility
-  sed -i -e "/char \* data/d" -e "/data =/i\ \ const char * data;" -e "/PyString_AsStringAndSize/i\ \ char * data;" ${srcdir}/${_dir}/src/python_compat.h
-}
+sha256sums=('24fc32a89eb1f6714d2f05c138c5d85741aabe819fc18475e63564aa0e2c388b')
 
 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
 }