From f006a08f33f89465674209434aacd55ef404d3a7 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Mon, 27 Oct 2014 12:13:08 +0100
Subject: [PATCH] [wip/ros-laser-geometry] Update to 1.6.2
This synchronizes with the ros-indigo version provided by robotpkg.
Changes since 1.5.14:
. allows to have range_cutoff > range_max.
. Fix mistake in end_time calculation for scan transformation.
While here, tidy DESCR, depend.mk, sort dependencies and fix PLIST.
---
ros-laser-geometry/DESCR | 5 ++++-
ros-laser-geometry/Makefile | 17 ++++++++---------
ros-laser-geometry/PLIST | 6 ++++--
ros-laser-geometry/depend.mk | 12 +++++++-----
ros-laser-geometry/distinfo | 6 +++---
5 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/ros-laser-geometry/DESCR b/ros-laser-geometry/DESCR
index 5c09d596..bac4c5fd 100644
--- a/ros-laser-geometry/DESCR
+++ b/ros-laser-geometry/DESCR
@@ -1 +1,4 @@
-This package contains a class for converting from a 2D laser scan as defined by sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud or sensor_msgs/PointCloud2. In particular, it contains functionality to account for the skew resulting from moving robots or tilting laser scanners.
+This package contains a class for converting from a 2D laser scan as defined by
+sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud
+or sensor_msgs/PointCloud2. In particular, it contains functionality to account
+for the skew resulting from moving robots or tilting laser scanners.
diff --git a/ros-laser-geometry/Makefile b/ros-laser-geometry/Makefile
index bfc90fe8..2ec3d60a 100644
--- a/ros-laser-geometry/Makefile
+++ b/ros-laser-geometry/Makefile
@@ -1,23 +1,22 @@
# robotpkg Makefile for: perception/ros-laser-geometry
-# Created: Charles Lesire on Tue, 8 Mar 2014
+# Created: Charles Lesire on Tue, 8 Apr 2014
#
ROS_PKG= laser_geometry
-ROS_VERSION= 1.5.14
+ROS_VERSION= 1.6.2
ROS_REPO= ros-perception
CATEGORIES= perception
-ROS_COMMENT= provides the LaserProjection class for turning laser scan data into point clouds
+ROS_COMMENT= C++ class turning laser scan data into point clouds
include ../../meta-pkgs/ros-base/Makefile.common
-include ../../interfaces/ros-common-msgs/depend.mk
-include ../../lang/ros-gencpp/depend.mk
-include ../../math/ros-geometry/depend.mk
+include ../../devel/ros-catkin/depend.mk
include ../../math/ros-angles/depend.mk
-include ../../math/eigen3/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
-
-include ../../devel/ros-catkin/depend.mk
+include ../../math/eigen3/depend.mk
+include ../../middleware/ros-comm/depend.mk
+include ../../interfaces/ros-common-msgs/depend.mk
+include ../../math/ros-geometry/depend.mk
include ../../mk/robotpkg.mk
diff --git a/ros-laser-geometry/PLIST b/ros-laser-geometry/PLIST
index 07c40dc9..e8f97880 100644
--- a/ros-laser-geometry/PLIST
+++ b/ros-laser-geometry/PLIST
@@ -1,8 +1,10 @@
-@comment Tue Apr 8 21:42:14 CEST 2014
+@comment Mon Oct 27 12:11:33 CET 2014
include/laser_geometry/laser_geometry.h
lib/liblaser_geometry.so
lib/pkgconfig/laser_geometry.pc
+${PYTHON_SITELIB}/laser_geometry-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
+${PYTHON_SITELIB}/laser_geometry/__init__.py
+${PYTHON_SITELIB}/laser_geometry/laser_geometry.py
share/laser_geometry/cmake/laser_geometryConfig-version.cmake
share/laser_geometry/cmake/laser_geometryConfig.cmake
share/laser_geometry/package.xml
-
diff --git a/ros-laser-geometry/depend.mk b/ros-laser-geometry/depend.mk
index a1046eaa..3589010a 100644
--- a/ros-laser-geometry/depend.mk
+++ b/ros-laser-geometry/depend.mk
@@ -1,5 +1,5 @@
# robotpkg depend.mk for: perception/ros-laser-geometry
-# Created: Charles Lesire on Tue, 8 Mar 2014
+# Created: Charles Lesire on Tue, 8 Apr 2014
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
@@ -24,12 +24,14 @@ DEPEND_DIR.ros-laser-geometry?= ../../wip/ros-laser-geometry
DEPEND_ABI.ros-laser-geometry.groovy?= ros-laser-geometry>=1.5<1.6
DEPEND_ABI.ros-laser-geometry.hydro?= ros-laser-geometry>=1.6<1.7
+DEPEND_ABI.ros-laser-geometry.indigo?= ros-laser-geometry>=1.6<1.7
SYSTEM_SEARCH.ros-laser-geometry=\
- include/laser_geometry/laser_geometry.h \
- lib/liblaser_geometry.so \
- lib/pkgconfig/laser_geometry.pc \
- share/laser_geometry/package.xml
+ 'include/laser_geometry/laser_geometry.h' \
+ 'lib/liblaser_geometry.so' \
+ '${PYTHON_SYSLIBSEARCH}/laser_geometry/__init__.py' \
+ 'lib/pkgconfig/laser_geometry.pc:/Version/s/[^0-9.]//gp' \
+ 'share/laser_geometry/package.xml:/<version>/s/[^0-9.]//gp'
endif # ROS_LASER_GEOMETRY_DEPEND_MK ------------------------------------------
diff --git a/ros-laser-geometry/distinfo b/ros-laser-geometry/distinfo
index 7e1b4223..f63cb871 100644
--- a/ros-laser-geometry/distinfo
+++ b/ros-laser-geometry/distinfo
@@ -1,3 +1,3 @@
-SHA1 (ros/laser_geometry-1.5.14.tar.gz) = a7898c9000e51a31c303c4c0a5126c5162ae882b
-RMD160 (ros/laser_geometry-1.5.14.tar.gz) = e4a5254a22e2f5aa5127502fcc27e26936339c22
-Size (ros/laser_geometry-1.5.14.tar.gz) = 12287 bytes
+SHA1 (ros/laser_geometry/1.6.2.tar.gz) = 35fb994d4dd8ff44ffbe16533be07cfe5e24f728
+RMD160 (ros/laser_geometry/1.6.2.tar.gz) = f216ca1948aa31d0b9c355bc75122f23b143e0c1
+Size (ros/laser_geometry/1.6.2.tar.gz) = 15615 bytes
--
GitLab