Update to version 1.12.21-1

2 files changed, 19 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48705e4b5a2d..9ac0b97ae3af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,17 @@
 # Generated by mksrcinfo v8
-# Mon May 22 17:06:35 UTC 2017
+# Sun Nov 12 16:15:31 UTC 2017
 pkgbase = ros-lunar-image-proc
 	pkgdesc = ROS - Single image rectification and color processing.
-	pkgver = 1.12.20
+	pkgver = 1.12.21
 	pkgrel = 1
 	url = http://www.ros.org/wiki/image_proc
 	arch = any
 	license = BSD
+	checkdepends = ros-lunar-rostest
+	checkdepends = ros-lunar-camera-calibration-parsers
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-lunar-catkin
-	makedepends = ros-lunar-roscpp
-	makedepends = ros-lunar-image-geometry
-	makedepends = ros-lunar-nodelet-topic-tools
-	makedepends = ros-lunar-dynamic-reconfigure
-	makedepends = ros-lunar-sensor-msgs
-	makedepends = ros-lunar-cv-bridge
-	makedepends = ros-lunar-nodelet
-	makedepends = ros-lunar-image-transport
 	makedepends = boost
 	depends = ros-lunar-roscpp
 	depends = ros-lunar-image-geometry
@@ -27,8 +21,8 @@ pkgbase = ros-lunar-image-proc
 	depends = ros-lunar-cv-bridge
 	depends = ros-lunar-nodelet
 	depends = ros-lunar-image-transport
-	source = ros-lunar-image-proc-1.12.20-0.tar.gz::https://github.com/ros-gbp/image_pipeline-release/archive/release/lunar/image_proc/1.12.20-0.tar.gz
-	sha256sums = 672dbd8ae720622fbdc57e18a4d08b4a98859d0a115028965e5baa2ea4eedb8e
+	source = ros-lunar-image-proc-1.12.21-0.tar.gz::https://github.com/ros-gbp/image_pipeline-release/archive/release/lunar/image_proc/1.12.21-0.tar.gz
+	sha256sums = aadb5778e58870aa448cf09cec3509776c7a9911f8d09792d748d5e9e4f2c19e
 
 pkgname = ros-lunar-image-proc
 
diff --git a/PKGBUILD b/PKGBUILD
index aacb0dc0109c..9eb096cd1738 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,13 @@ pkgdesc="ROS - Single image rectification and color processing."
 url='http://www.ros.org/wiki/image_proc'
 
 pkgname='ros-lunar-image-proc'
-pkgver='1.12.20'
+pkgver='1.12.21'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-lunar-catkin
-  ros-lunar-roscpp
-  ros-lunar-image-geometry
-  ros-lunar-nodelet-topic-tools
-  ros-lunar-dynamic-reconfigure
-  ros-lunar-sensor-msgs
-  ros-lunar-cv-bridge
-  ros-lunar-nodelet
-  ros-lunar-image-transport)
+ros_makedepends=(ros-lunar-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   boost)
@@ -33,6 +25,10 @@ ros_depends=(ros-lunar-roscpp
   ros-lunar-image-transport)
 depends=(${ros_depends[@]})
 
+ros_checkdepends=(ros-lunar-rostest
+  ros-lunar-camera-calibration-parsers)
+checkdepends=(${ros_checkdepends[@]})
+
 # Git version (e.g. for debugging)
 # _tag=release/lunar/image_proc/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
@@ -42,7 +38,7 @@ depends=(${ros_depends[@]})
 # Tarball version (faster download)
 _dir="image_pipeline-release-release-lunar-image_proc-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/image_pipeline-release/archive/release/lunar/image_proc/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('672dbd8ae720622fbdc57e18a4d08b4a98859d0a115028965e5baa2ea4eedb8e')
+sha256sums=('aadb5778e58870aa448cf09cec3509776c7a9911f8d09792d748d5e9e4f2c19e')
 
 build() {
   # Use ROS environment variables
@@ -50,14 +46,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 \
@@ -65,7 +61,8 @@ 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
 }