From 76973091cb62544d79e890fe5bfea4e5f6ac264d Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 25 Jan 2016 13:54:09 +0100
Subject: [PATCH] [wip/hrp2-computer] Fix category and remove useless ros
metapkg.
---
hrp2-computer-monitor/Makefile | 7 ++-----
hrp2-computer-monitor/depend.mk | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hrp2-computer-monitor/Makefile b/hrp2-computer-monitor/Makefile
index 0ff7c4c1..3ca5f0b7 100644
--- a/hrp2-computer-monitor/Makefile
+++ b/hrp2-computer-monitor/Makefile
@@ -4,8 +4,8 @@
VERSION= 1.0.0
ROS_PKG= hrp2-computer-monitor
ROS_VERSION= ${VERSION}
-DISTNAME= hrp2-computer-monitor
-CATEGORIES= robots
+DISTNAME= hrp2-computer-monitor-${VERSION}
+CATEGORIES= wip
MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-computer-monitor
@@ -20,9 +20,6 @@ NO_PUBLIC_BIN= ${RESTRICTED}
DYNAMIC_PLIST_DIRS+= share/doc/hrp2_computer_monitor
-
-include ../../meta-pkgs/ros-base/Makefile.common
-
include ../../devel/ros-catkin/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
include ../../interfaces/ros-std-msgs/depend.mk
diff --git a/hrp2-computer-monitor/depend.mk b/hrp2-computer-monitor/depend.mk
index bed92401..d176a45a 100644
--- a/hrp2-computer-monitor/depend.mk
+++ b/hrp2-computer-monitor/depend.mk
@@ -17,10 +17,10 @@ SYSTEM_SEARCH.hrp2-computer-monitor=\
'lib/pkgconfig/hrp2-computer-monitor.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= hrp2-computer-monitor
-ROS_DEPEND_USER+= hrp2-computer-monitor
+ROS_DEPEND_USER+= ros-hrp2-computer-monitor
DEPEND_ABI.hrp2-computer-monitor?= hrp2-computer-monitor>=1.0.0
-DEPEND_DIR.hrp2-computer-monitor?= ../../robots/hrp2-computer-monitor
+DEPEND_DIR.hrp2-computer-monitor?= ../../wip/hrp2-computer-monitor
endif # HRP2_COMPUTER_MONITOR_DEPEND_MK -------------------------------------------------
--
GitLab