Update

2 files changed, 12 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d006baf5105..dbe6058b69d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-bondcpp
 	pkgdesc = ROS - C++ implementation of bond, a mechanism for checking when another process has terminated.
 	pkgver = 1.8.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ros.org/wiki/bondcpp
 	arch = any
 	license = BSD
@@ -19,8 +19,8 @@ pkgbase = ros-melodic-bondcpp
 	depends = ros-melodic-roscpp
 	depends = util-linux
 	depends = boost
-	source = ros-melodic-bondcpp-1.8.2-0.tar.gz::https://github.com/ros-gbp/bond_core-release/archive/release/melodic/bondcpp/1.8.2-0.tar.gz
-	sha256sums = efddb54b16d5b2a10b7673832c10cc352bb34354666be2d68b2307ecc742d8e9
+	source = ros-melodic-bondcpp::git+https://github.com/ros/bond_core.git#branch=kinetic-devel
+	sha256sums = SKIP
 
 pkgname = ros-melodic-bondcpp
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e06d70444a7..95834c0fc430 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-melodic-bondcpp'
 pkgver='1.8.2'
 _pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(ros-melodic-bond
@@ -34,9 +34,13 @@ depends=(${ros_depends[@]}
 # sha256sums=('SKIP')
 
 # Tarball version (faster download)
-_dir="bond_core-release-release-melodic-bondcpp-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/bond_core-release/archive/release/melodic/bondcpp/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('efddb54b16d5b2a10b7673832c10cc352bb34354666be2d68b2307ecc742d8e9')
+#_dir="bond_core-release-release-melodic-bondcpp-${pkgver}-${_pkgver_patch}"
+#source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/bond_core-release/archive/release/melodic/bondcpp/${pkgver}-${_pkgver_patch}.tar.gz")
+#sha256sums=('efddb54b16d5b2a10b7673832c10cc352bb34354666be2d68b2307ecc742d8e9')
+_branch="kinetic-devel"
+_dir=${pkgname}
+source=("${_dir}"::"git+https://github.com/ros/bond_core.git"#branch=${_branch})
+sha256sums=('SKIP')
 
 build() {
   # Use ROS environment variables
@@ -51,7 +55,7 @@ build() {
   /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
 
   # Build project
-  cmake ${srcdir}/${_dir} \
+  cmake ${srcdir}/${_dir}/bondcpp/ \
         -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
         -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \