From b5aa52cba9c5e01cac62a21a302f18c7ac471128 Mon Sep 17 00:00:00 2001 From: Marius Winkelmeier Date: Fri, 23 Aug 2024 10:07:53 +0200 Subject: [PATCH 1/2] add: package.xml with dependencies to pinocchio to prepare for ros-humble-libfranka release --- CMakeLists.txt | 2 +- package.xml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 package.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index c3b03ef5..0f1ffcf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,7 +184,7 @@ set(CPACK_SYSTEM_NAME ${CMAKE_HOST_SYSTEM_PROCESSOR}) set(CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}-1) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Franka Emika GmbH") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libpoco-dev") -set(CPACK_DEBIAN_PACKAGE_CONFLICTS "ros-kinetic-libfranka, ros-melodic-libfranka, ros-noetic-libfranka, ros-foxy-libfranka") +set(CPACK_DEBIAN_PACKAGE_CONFLICTS "ros-kinetic-libfranka, ros-melodic-libfranka, ros-noetic-libfranka, ros-foxy-libfranka, ros-humble-libfranka") include(CPack) ## Tools diff --git a/package.xml b/package.xml new file mode 100644 index 00000000..d3f8df5a --- /dev/null +++ b/package.xml @@ -0,0 +1,32 @@ + + + + libfranka + 0.14.0 + libfranka is a C++ library for Franka Robotics research robots + Franka Robotics GmbH + Apache 2.0 + + http://wiki.ros.org/libfranka + https://github.com/frankaemika/libfranka + https://github.com/frankaemika/libfranka/issues + Franka Robotics GmbH + + cmake + + eigen + libpoco-dev + pinocchio + + libpoco-dev + pinocchio + + doxygen + graphviz + + + cmake + + \ No newline at end of file From 59eda8d4f75d9a9f12fa8254630929a0f87e4efe Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Fri, 6 Sep 2024 11:11:25 +0200 Subject: [PATCH 2/2] version 0.9.2 without 'pinocchio' --- package.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package.xml b/package.xml index d3f8df5a..c94d85fc 100644 --- a/package.xml +++ b/package.xml @@ -4,7 +4,7 @@ schematypens="http://www.w3.org/2001/XMLSchema"?> libfranka - 0.14.0 + 0.9.2 libfranka is a C++ library for Franka Robotics research robots Franka Robotics GmbH Apache 2.0 @@ -18,10 +18,8 @@ eigen libpoco-dev - pinocchio libpoco-dev - pinocchio doxygen graphviz @@ -29,4 +27,4 @@ cmake - \ No newline at end of file +