From ad5a1d8440420292f40dcb5e1723f86135051d2e Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 25 Jan 2016 11:35:30 +0100
Subject: [PATCH] [wip/hrp2-bringup] Fix naming convention
---
hrp2-bringup/Makefile | 5 +++--
hrp2-bringup/depend.mk | 2 +-
hrp2-computer-monitor/Makefile | 5 +++--
hrp2-computer-monitor/depend.mk | 2 +-
hrp2-computer-monitor/distinfo | 6 +++---
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/hrp2-bringup/Makefile b/hrp2-bringup/Makefile
index 898ad2bd..571720ca 100644
--- a/hrp2-bringup/Makefile
+++ b/hrp2-bringup/Makefile
@@ -2,9 +2,9 @@
# Created: Olivier Stasse on Wed, 14 Jav 2015
#
VERSION= 1.0.4
-ROS_PKG= hrp2_bringup
+ROS_PKG= hrp2-bringup
ROS_VERSION= ${VERSION}
-DISTNAME= hrp2_bringup-${VERSION}
+DISTNAME= hrp2-bringup-${VERSION}
CATEGORIES= robots
MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-bringup
@@ -12,6 +12,7 @@ MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-bringup
MAINTAINER= gepetto@laas.fr
COMMENT= Hrp2 ros package to start HRP-2
LICENSE= openhrp-grx-license
+WRKSRC= ${WRKDIR}/hrp2_bringup-${VERSION}
RESTRICTED= Redistribution of repackaged binaries not permitted
NO_PUBLIC_SRC= ${RESTRICTED}
diff --git a/hrp2-bringup/depend.mk b/hrp2-bringup/depend.mk
index cdafa5e5..100931a4 100644
--- a/hrp2-bringup/depend.mk
+++ b/hrp2-bringup/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hrp2-bringup
endif
-ifeq (+,$(ROMEO_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_BRINGUP_DEPEND_MK)) # -------------------------------------------
PREFER.hrp2-bringup?= robotpkg
diff --git a/hrp2-computer-monitor/Makefile b/hrp2-computer-monitor/Makefile
index c3c861f0..0ff7c4c1 100644
--- a/hrp2-computer-monitor/Makefile
+++ b/hrp2-computer-monitor/Makefile
@@ -2,9 +2,9 @@
# Created: Olivier Stasse on Wed, 17 Jun 2015
#
VERSION= 1.0.0
-ROS_PKG= hrp2_computer_monitor
+ROS_PKG= hrp2-computer-monitor
ROS_VERSION= ${VERSION}
-DISTNAME= hrp2_computer_monitor
+DISTNAME= hrp2-computer-monitor
CATEGORIES= robots
MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-computer-monitor
@@ -12,6 +12,7 @@ MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-computer-monitor
MAINTAINER= gepetto@laas.fr
COMMENT= Hrp2 ros monitoring package
LICENSE= openhrp-grx-license
+WRKSRC= ${WRKDIR}/hrp2_computer_monitor-${VERSION}
RESTRICTED= Redistribution of repackaged binaries not permitted
NO_PUBLIC_SRC= ${RESTRICTED}
diff --git a/hrp2-computer-monitor/depend.mk b/hrp2-computer-monitor/depend.mk
index 8e2045f8..bed92401 100644
--- a/hrp2-computer-monitor/depend.mk
+++ b/hrp2-computer-monitor/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hrp2-computer-monitor
endif
-ifeq (+,$(ROMEO_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_COMPUTER_MONITOR_DEPEND_MK)) # -------------------------------------------
PREFER.hrp2-computer-monitor?= robotpkg
diff --git a/hrp2-computer-monitor/distinfo b/hrp2-computer-monitor/distinfo
index eac36cd0..8850491a 100644
--- a/hrp2-computer-monitor/distinfo
+++ b/hrp2-computer-monitor/distinfo
@@ -1,3 +1,3 @@
-SHA1 (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 88a079f41e64c0ea07984e2846fd1590cf82b9f0
-RMD160 (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 7dfb316fabb2b02010e8348a1cc8e1021e694b5b
-Size (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 88890 bytes
+SHA1 (ros/hrp2-computer-monitor/1.0.0.tar.gz) = 88a079f41e64c0ea07984e2846fd1590cf82b9f0
+RMD160 (ros/hrp2-computer-monitor/1.0.0.tar.gz) = 7dfb316fabb2b02010e8348a1cc8e1021e694b5b
+Size (ros/hrp2-computer-monitor/1.0.0.tar.gz) = 88890 bytes
--
GitLab