updated version to 1.0.2 and added patch because of still wrong verison number in package.xml

3 files changed, 30 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b339d4ce78b..732f20321f12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ros-kinetic-moveit-ros-perception
 	pkgdesc = ROS - Components of MoveIt connecting to perception.
-	pkgver = 0.9.15
+	pkgver = 1.0.2
 	pkgrel = 1
 	url = http://moveit.ros.org
 	arch = any
@@ -41,10 +41,12 @@ pkgbase = ros-kinetic-moveit-ros-perception
 	depends = glut
 	depends = glew
 	depends = mesa-libgl
-	source = ros-kinetic-moveit-ros-perception-0.9.15-0.tar.gz::https://github.com/ros-gbp/moveit-release/archive/release/kinetic/moveit_ros_perception/0.9.15-0.tar.gz
+	source = ros-kinetic-moveit-ros-perception-1.0.2-0.tar.gz::https://github.com/ros-gbp/moveit-release/archive/release/kinetic/moveit_ros_perception/1.0.2-0.tar.gz
 	source = moveit_ros_perception_boost.patch
-	sha256sums = ac7f565766ee1c96434711462dd6b82235b3668c2cec91724aa8b745081c46cb
+	source = package.xml_version.patch
+	sha256sums = f0c7751a685c9e3d5c6760f3f87ef393d8022a11698ace7209670e8538708e4b
 	sha256sums = 69d478cedc9f31464063ace7ea346f2ac218def046154a0b8bb84fcb1b1a94a8
+	sha256sums = 7160a9d44ffe169f5b9f6750f0d21cd12ab3fe06d38fe77bb7551bd73a059006
 
 pkgname = ros-kinetic-moveit-ros-perception
 
diff --git a/PKGBUILD b/PKGBUILD
index 7148e3e11b63..9f11d98aabce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - Components of MoveIt connecting to perception."
 url='http://moveit.ros.org'
 
 pkgname='ros-kinetic-moveit-ros-perception'
-pkgver='0.9.15'
+pkgver='1.0.2'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
@@ -56,21 +56,18 @@ depends=(${ros_depends[@]}
 # sha256sums=('SKIP')
 
 # Tarball version (faster download)
-_dir="moveit-release-release-kinetic-moveit_ros_perception-${pkgver}-${_pkgver_patch}"
+_dir="moveit-release-release-kinetic-moveit_ros_perception"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/moveit-release/archive/release/kinetic/moveit_ros_perception/${pkgver}-${_pkgver_patch}.tar.gz"
-        'moveit_ros_perception_boost.patch')
-sha256sums=('ac7f565766ee1c96434711462dd6b82235b3668c2cec91724aa8b745081c46cb'
-            '69d478cedc9f31464063ace7ea346f2ac218def046154a0b8bb84fcb1b1a94a8')
+        'moveit_ros_perception_boost.patch'
+        'package.xml_version.patch')
+sha256sums=('f0c7751a685c9e3d5c6760f3f87ef393d8022a11698ace7209670e8538708e4b'
+            '69d478cedc9f31464063ace7ea346f2ac218def046154a0b8bb84fcb1b1a94a8'
+            '7160a9d44ffe169f5b9f6750f0d21cd12ab3fe06d38fe77bb7551bd73a059006')
 
 prepare() {
-  cd ${srcdir}
-  find . \( -iname *.cpp -o -iname *.h \) \
-	  -exec sed -r -i "s/[^_]logError/CONSOLE_BRIDGE_logError/" {} \; \
-	  -exec sed -r -i "s/[^_]logWarn/CONSOLE_BRIDGE_logWarn/" {} \; \
-	  -exec sed -r -i "s/[^_]logDebug/CONSOLE_BRIDGE_logDebug/" {} \; \
-	  -exec sed -r -i "s/[^_]logInform/CONSOLE_BRIDGE_logInform/" {} \;
   cd ${srcdir}/${_dir}
   patch -Np1 -i ${srcdir}/moveit_ros_perception_boost.patch
+  patch -Np1 -i ${srcdir}/package.xml_version.patch
 }
 
 build() {
diff --git a/package.xml_version.patch b/package.xml_version.patch
new file mode 100644
index 000000000000..596a4103fe61
--- /dev/null
+++ b/package.xml_version.patch
@@ -0,0 +1,17 @@
+*** a/package.xml	2019-12-12 22:38:43.395610271 +0100
+--- b/package.xml	2019-12-12 22:38:25.368926599 +0100
+***************
+*** 1,6 ****
+  <package>
+    <name>moveit_ros_perception</name>
+!   <version>0.9.17</version>
+    <description>Components of MoveIt! connecting to perception</description>
+  
+    <author email="isucan@google.com">Ioan Sucan</author>
+--- 1,6 ----
+  <package>
+    <name>moveit_ros_perception</name>
+!   <version>1.0.2</version>
+    <description>Components of MoveIt! connecting to perception</description>
+  
+    <author email="isucan@google.com">Ioan Sucan</author>