From b2c08c0118aa23fc70c89fd0700a008da872f38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin=20Lemaignan?= <severin.lemaignan@laas.fr>
Date: Fri, 26 Oct 2012 10:24:45 +0200
Subject: [PATCH] [wip/mhp-genom] Re-release mhp, including several compilation
fixes omitted in previous release
While here, remove old patch that is not relevant anymore.
Compilation tested with options: pr2 spark tcl
---
mhp-genom/Makefile | 4 ++--
mhp-genom/distinfo | 6 +++---
mhp-genom/patches/patch-aa | 13 -------------
3 files changed, 5 insertions(+), 18 deletions(-)
delete mode 100644 mhp-genom/patches/patch-aa
diff --git a/mhp-genom/Makefile b/mhp-genom/Makefile
index 29dd35f3..40e83690 100644
--- a/mhp-genom/Makefile
+++ b/mhp-genom/Makefile
@@ -2,12 +2,12 @@
# Created: Severin Lemaignan on Tue, 31 Aug 2010
#
-DISTNAME= mhp-genom-3.11
+DISTNAME= mhp-genom-3.11.1
CATEGORIES= path
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}mhp-genom
-MAINTAINER= easisbot@laas.fr
+MAINTAINER= robots@laas.fr
COMMENT= Motion in Human Presence module
#mhp-genom is currently GPL because it depends on BioMove3D that depends itself
# on GSL and GLPK that are 2 GLP librairies.
diff --git a/mhp-genom/distinfo b/mhp-genom/distinfo
index cf2c2f90..d25f8b9c 100644
--- a/mhp-genom/distinfo
+++ b/mhp-genom/distinfo
@@ -1,3 +1,3 @@
-SHA1 (mhp-genom-3.11.tar.gz) = 95bc0fa3f51fc65732ad625f3cd4cdb301af1649
-RMD160 (mhp-genom-3.11.tar.gz) = 74a6a469788df67593a096ad9df01c724bfb7bef
-Size (mhp-genom-3.11.tar.gz) = 44575 bytes
+SHA1 (mhp-genom-3.11.1.tar.gz) = 795c63076ecd35f53aa6c05d083c2996eade8355
+RMD160 (mhp-genom-3.11.1.tar.gz) = 785961ee8031d3cf5bc425696a9396b5a396baad
+Size (mhp-genom-3.11.1.tar.gz) = 44597 bytes
diff --git a/mhp-genom/patches/patch-aa b/mhp-genom/patches/patch-aa
deleted file mode 100644
index ccf23210..00000000
--- a/mhp-genom/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/codels/mhpManipulationCodels.cc b/codels/mhpManipulationCodels.cc
-index d2def26..07fb13c 100644
---- codels/mhpManipulationCodels.cc
-+++ codels/mhpManipulationCodels.cc
-@@ -687,7 +687,7 @@ mhpArmPlanTaskMain(STRUCT_MHP_ARM_PLAN_PARAMS *armPlanTaskParams, int *report)
- }
-
- if(smTrajs[0].convertToSM_TRAJ_STR(&(SDI_F->armTrajArray.traj[indexTraj])) != 0) {
-- smTraj[0].clear();
-+ smTrajs[0].clear();
- smTrajs[0].convertToSM_TRAJ_STR(&(SDI_F->armTrajArray.traj[indexTraj]));
- *report = S_mhp_NO_TRAJ_FOUND;
- }
--
GitLab