Update to version 0.4.10-1

2 files changed, 33 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2782fc6b4fc3..f1ab25c19011 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Aug  6 10:47:41 UTC 2017
+# Tue Oct 24 19:39:00 UTC 2017
 pkgbase = ros-lunar-rqt-image-view
 	pkgdesc = ROS - rqt_image_view provides a GUI plugin for displaying images using image_transport.
-	pkgver = 0.4.9
+	pkgver = 0.4.10
 	pkgrel = 1
 	url = http://wiki.ros.org/rqt_image_view
 	arch = any
@@ -10,20 +10,14 @@ pkgbase = ros-lunar-rqt-image-view
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-lunar-catkin
-	makedepends = ros-lunar-rqt-gui-cpp
-	makedepends = ros-lunar-geometry-msgs
-	makedepends = ros-lunar-image-transport
-	makedepends = ros-lunar-sensor-msgs
-	makedepends = ros-lunar-cv-bridge
-	makedepends = ros-lunar-rqt-gui
 	depends = ros-lunar-rqt-gui-cpp
 	depends = ros-lunar-geometry-msgs
 	depends = ros-lunar-image-transport
 	depends = ros-lunar-sensor-msgs
 	depends = ros-lunar-cv-bridge
 	depends = ros-lunar-rqt-gui
-	source = ros-lunar-rqt-image-view-0.4.9-0.tar.gz::https://github.com/ros-gbp/rqt_image_view-release/archive/release/lunar/rqt_image_view/0.4.9-0.tar.gz
-	sha256sums = 2531400cd8a4e72c62b49d3b3545b23db4121ce7de2d1378ac14f5a4a7c01978
+	source = ros-lunar-rqt-image-view-0.4.10-0.tar.gz::https://github.com/ros-gbp/rqt_image_view-release/archive/release/lunar/rqt_image_view/0.4.10-0.tar.gz
+	sha256sums = 9d69ccb15dd24b3e70ea1b71d18064722b80cce3b1ff5ee73432df088a9eb841
 
 pkgname = ros-lunar-rqt-image-view
 
diff --git a/PKGBUILD b/PKGBUILD
index 086da1cd3889..e19d90c6d127 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,13 @@ pkgdesc="ROS - rqt_image_view provides a GUI plugin for displaying images using
 url='http://wiki.ros.org/rqt_image_view'
 
 pkgname='ros-lunar-rqt-image-view'
-pkgver='0.4.9'
+pkgver='0.4.10'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-lunar-catkin
-  ros-lunar-rqt-gui-cpp
-  ros-lunar-geometry-msgs
-  ros-lunar-image-transport
-  ros-lunar-sensor-msgs
-  ros-lunar-cv-bridge
-  ros-lunar-rqt-gui)
+ros_makedepends=(ros-lunar-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
@@ -28,6 +22,9 @@ ros_depends=(ros-lunar-rqt-gui-cpp
   ros-lunar-rqt-gui)
 depends=(${ros_depends[@]})
 
+ros_checkdepends=()
+checkdepends=(${ros_checkdepends[@]})
+
 # Git version (e.g. for debugging)
 # _tag=release/lunar/rqt_image_view/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
@@ -37,7 +34,7 @@ depends=(${ros_depends[@]})
 # Tarball version (faster download)
 _dir="rqt_image_view-release-release-lunar-rqt_image_view-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_image_view-release/archive/release/lunar/rqt_image_view/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('2531400cd8a4e72c62b49d3b3545b23db4121ce7de2d1378ac14f5a4a7c01978')
+sha256sums=('9d69ccb15dd24b3e70ea1b71d18064722b80cce3b1ff5ee73432df088a9eb841')
 
 build() {
   # Use ROS environment variables
@@ -45,14 +42,14 @@ build() {
   [ -f /opt/ros/lunar/setup.bash ] && source /opt/ros/lunar/setup.bash
 
   # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+  [ -d "${srcdir}/build" ] || mkdir "${srcdir}/build"
+  cd "${srcdir}/build"
 
   # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+  /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 "${srcdir}/${_dir}"
 
   # Build project
-  cmake ${srcdir}/${_dir} \
+  cmake "${srcdir}/${_dir}" \
         -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
         -DCMAKE_INSTALL_PREFIX=/opt/ros/lunar \
@@ -60,10 +57,28 @@ build() {
         -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
         -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
         -DPYTHON_BASENAME=-python2.7 \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
+        -DSETUPTOOLS_DEB_LAYOUT=OFF \
+        -DCATKIN_ENABLE_TESTING=OFF
   make
 }
 
+check() {
+  cmake "${srcdir}/${_dir}" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/lunar \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+        -DPYTHON_BASENAME=-python2.7 \
+        -DSETUPTOOLS_DEB_LAYOUT=OFF \
+        -DCATKIN_ENABLE_TESTING=ON
+
+  make tests
+  . /opt/ros/lunar/setup.bash
+  make run_tests
+}
+
 package() {
   cd "${srcdir}/build"
   make DESTDIR="${pkgdir}/" install