diff --git a/mhp-genom/Makefile b/mhp-genom/Makefile index 1f91b6fc069b30ab9b9f685463ece7f4c7358a4b..548ef55762ad1a61a34a30550c1b608e18c2147a 100644 --- a/mhp-genom/Makefile +++ b/mhp-genom/Makefile @@ -2,7 +2,7 @@ # Created: Severin Lemaignan on Tue, 31 Aug 2010 # -DISTNAME= mhp-genom-3.9 +DISTNAME= mhp-genom-3.10 CATEGORIES= path MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/} MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}mhp-genom diff --git a/mhp-genom/depend.mk b/mhp-genom/depend.mk index 7bff0a5b15a3a6b0da77788fb39cf6b59e70d21e..7e949878e09d0f4fac1ef710f716a106ded21837 100644 --- a/mhp-genom/depend.mk +++ b/mhp-genom/depend.mk @@ -33,7 +33,7 @@ SYSTEM_SEARCH.mhp-genom=\ DEPEND_USE+= mhp-genom -DEPEND_ABI.mhp-genom?=mhp-genom>=3.9 +DEPEND_ABI.mhp-genom?=mhp-genom>=3.10 DEPEND_DIR.mhp-genom?=../../wip/mhp-genom #include ../../wip/?? diff --git a/mhp-genom/distinfo b/mhp-genom/distinfo index f6660ee14734c1aa5fc6439d818a32baf661e3fa..366816132d17db68bb008f434fcf2ac6e893a6bf 100644 --- a/mhp-genom/distinfo +++ b/mhp-genom/distinfo @@ -1,3 +1,4 @@ -SHA1 (mhp-genom-3.9.tar.gz) = 8e32ed7e105fb4e26087ce40252154b47faaf804 -RMD160 (mhp-genom-3.9.tar.gz) = e4bb7664a8e4036d4296be8683596a10de9fc391 -Size (mhp-genom-3.9.tar.gz) = 38853 bytes +SHA1 (mhp-genom-3.10.tar.gz) = ef18bf5683a34136ba1cd1d77136698a703b0583 +RMD160 (mhp-genom-3.10.tar.gz) = 04fed96664654bb1747ed911ea09c1649a9ab49c +Size (mhp-genom-3.10.tar.gz) = 41331 bytes +SHA1 (patch-aa) = 9bb020f2f53733edf850b5bcbc78a3d301868d3e diff --git a/mhp-genom/patches/patch-aa b/mhp-genom/patches/patch-aa new file mode 100644 index 0000000000000000000000000000000000000000..ccf2321035347ca4b386706402d1371d4ec7cab8 --- /dev/null +++ b/mhp-genom/patches/patch-aa @@ -0,0 +1,13 @@ +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; + }