diff --git a/py-sot-application-v3/Makefile b/py-sot-application-v3/Makefile index e76da571ad1d2a9aed227b7c7477ec7f8d2a4795..6344b2c292875ac66e2ca2cf875c1f313583fcb5 100644 --- a/py-sot-application-v3/Makefile +++ b/py-sot-application-v3/Makefile @@ -4,7 +4,7 @@ ORG= stack-of-tasks NAME= sot-application -VERSION= 1.2.4 +VERSION= 1.2.5 PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION} @@ -16,7 +16,6 @@ CONFLICTS+= py[0-9][0-9]-${NAME} include ../../devel/jrl-cmakemodules/Makefile.common include ../../wip/sot-dynamic-pinocchio-v3/depend.mk include ../../wip/py-sot-dynamic-pinocchio-v3/depend.mk -#include ../../wip/sot-dyninv-v3/depend.mk include ../../wip/sot-tools-v3/depend.mk include ../../wip/py-sot-tools-v3/depend.mk include ../../wip/sot-core-v3/depend.mk @@ -29,7 +28,6 @@ include ../../mapping/octomap/depend.mk include ../../math/py-pinocchio/depend.mk include ../../math/py-eigenpy/depend.mk include ../../math/eigen3/depend.mk -include ../../pkgtools/pkg-config/depend.mk include ../../mk/sysdep/cmake.mk include ../../mk/sysdep/doxygen.mk include ../../mk/sysdep/graphviz.mk diff --git a/py-sot-application-v3/PLIST b/py-sot-application-v3/PLIST index b7f80a2ab7e7c739208c788d1138c0d78989909c..733cb04a4ec94bc676b884ca84d1a07dcd03789c 100644 --- a/py-sot-application-v3/PLIST +++ b/py-sot-application-v3/PLIST @@ -12,3 +12,4 @@ ${PYTHON_SITELIB}/sot_application/acceleration/precomputed_meta_tasks.py ${PYTHON_SITELIB}/sot_application/velocity/__init__.py ${PYTHON_SITELIB}/sot_application/velocity/precomputed_meta_tasks.py ${PYTHON_SITELIB}/sot_application/velocity/precomputed_tasks.py +share/sot-application/package.xml diff --git a/py-sot-application-v3/depend.mk b/py-sot-application-v3/depend.mk index a4a10bb380228096ee1308f3392eed1b093ecd7e..62a270307a37828c315f96d411f3a3fc5237d4a2 100644 --- a/py-sot-application-v3/depend.mk +++ b/py-sot-application-v3/depend.mk @@ -17,7 +17,8 @@ SYSTEM_SEARCH.py-sot-application-v3= \ 'include/sot/application/config.hh:/SOT_APPLICATION_VERSION /s/[^0-9.]//gp' \ '${PYTHON_SYSLIBSEARCH}/sot_application/__init__.py' \ 'lib/cmake/sot-application/sot-applicationConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \ - 'lib/pkgconfig/sot-application.pc:/Version/s/[^0-9.]//gp' + 'lib/pkgconfig/sot-application.pc:/Version/s/[^0-9.]//gp' \ + 'share/sot-application/package.xml:/<version>/s/[^0-9.]//gp' DEPEND_USE+= py-sot-application-v3 diff --git a/py-sot-application-v3/distinfo b/py-sot-application-v3/distinfo index 4166becf8f1c3fa15a01f7395059e49232ac8441..e59f4f056a5a56c8eb44dc95e237b93d6dba971d 100644 --- a/py-sot-application-v3/distinfo +++ b/py-sot-application-v3/distinfo @@ -1,3 +1,3 @@ -SHA1 (sot-application-1.2.4.tar.gz) = 313790cc5e87c3e7e6558ea2faf047997b8c6d32 -RMD160 (sot-application-1.2.4.tar.gz) = 3897cedcc310e2fe7d296cc1242190d5cffd7b9a -Size (sot-application-1.2.4.tar.gz) = 811365 bytes +SHA1 (sot-application-1.2.5.tar.gz) = 7eff34ce00a9e31e8271f8fbca45601787eca9d0 +RMD160 (sot-application-1.2.5.tar.gz) = 4dcbac40a50f937f0f2465204ea0e8a3c25e46b4 +Size (sot-application-1.2.5.tar.gz) = 815505 bytes