From 2fd0f4a83a32451118dc6acd33bccc4d6d9d11bd Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Fri, 6 Dec 2013 11:56:00 +0100
Subject: [PATCH] [wip/ros-realtime-tools] Relax ros dependency to ros>=groovy
The package compiles with ros==groovy. However, ros-groovy does not contain
this package, and the ros-realtime-tools dependency will not be met when
PREFER.ros==system.
It is also not currently possible to set a specific PREFER.ros-realtime-tools
default to robotpkg or system automatically depending on the ros version to be
used. So binary packages depending on this one won't built because of the unmet
dependency.
While here, fix a typo in PREFER.ros-realtime-tools and fix files permissions.
---
ros-realtime-tools/DESCR | 0
ros-realtime-tools/Makefile | 2 +-
ros-realtime-tools/PLIST | 0
ros-realtime-tools/depend.mk | 4 +++-
ros-realtime-tools/distinfo | 0
5 files changed, 4 insertions(+), 2 deletions(-)
mode change 100755 => 100644 ros-realtime-tools/DESCR
mode change 100755 => 100644 ros-realtime-tools/Makefile
mode change 100755 => 100644 ros-realtime-tools/PLIST
mode change 100755 => 100644 ros-realtime-tools/depend.mk
mode change 100755 => 100644 ros-realtime-tools/distinfo
diff --git a/ros-realtime-tools/DESCR b/ros-realtime-tools/DESCR
old mode 100755
new mode 100644
diff --git a/ros-realtime-tools/Makefile b/ros-realtime-tools/Makefile
old mode 100755
new mode 100644
index 541f63e6..6757561f
--- a/ros-realtime-tools/Makefile
+++ b/ros-realtime-tools/Makefile
@@ -11,7 +11,7 @@ ROS_COMMENT= topic publisher from reatime threads
include ../../meta-pkgs/ros-base/Makefile.common
-DEPEND_ABI.ros+=ros>=hydro
+DEPEND_ABI.ros+=ros>=groovy
include ../../devel/ros-catkin/depend.mk
include ../../middleware/ros-comm/depend.mk
diff --git a/ros-realtime-tools/PLIST b/ros-realtime-tools/PLIST
old mode 100755
new mode 100644
diff --git a/ros-realtime-tools/depend.mk b/ros-realtime-tools/depend.mk
old mode 100755
new mode 100644
index 55a0991d..bfd3f612
--- a/ros-realtime-tools/depend.mk
+++ b/ros-realtime-tools/depend.mk
@@ -12,12 +12,14 @@ endif
ifeq (+,$(ROS_REALTIMETOOLS_DEPEND_MK)) # ----------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-reatime-tools?= ${PREFER.ros-base}
+PREFER.ros-realtime-tools?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-realtime-tools?= ${SYSTEM_PREFIX.ros-base}
DEPEND_USE+= ros-realtime-tools
ROS_DEPEND_USE+= ros-realtime-tools
+DEPEND_ABI.ros+=ros>=groovy
+
DEPEND_ABI.ros-realtime-tools?= ros-realtime-tools>=1.8.2
DEPEND_DIR.ros-realtime-tools?= ../../wip/ros-realtime-tools
diff --git a/ros-realtime-tools/distinfo b/ros-realtime-tools/distinfo
old mode 100755
new mode 100644
--
GitLab