From 880ca37f2878fa9816494f280b88e58430f8f8bf Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco Date: Tue, 3 Nov 2015 22:15:11 +0100 Subject: [PATCH] debian: mrpt-apps split in 2 New arch-indep pkg mrpt-common with all dataset & sample files, to better follow Debian rules and avoid Lintian complaints. --- CMakeLists.txt | 2 ++ cmakemodules/script_install_commands.cmake | 2 +- packaging/debian/control.in | 17 +++++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51028f3568..7c1516ec48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -637,12 +637,14 @@ IF(CMAKE_MRPT_USE_DEB_POSTFIXS) SET(mrpt_apps_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/mrpt-apps/usr/") SET(mrpt_doc_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/mrpt-doc/usr/") + SET(mrpt_common_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/mrpt-common/usr/") SET(mrpt_pkgconfig_INSTALL_PREFIX "/usr") # Values when building a Debian package ELSE(CMAKE_MRPT_USE_DEB_POSTFIXS) # Values under normal conditions ----------------------- SET(libmrpt_dev_INSTALL_PREFIX "") SET(mrpt_apps_INSTALL_PREFIX "") SET(mrpt_doc_INSTALL_PREFIX "") + SET(mrpt_common_INSTALL_PREFIX "") SET(mrpt_pkgconfig_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") # Values under normal conditions ENDIF(CMAKE_MRPT_USE_DEB_POSTFIXS) diff --git a/cmakemodules/script_install_commands.cmake b/cmakemodules/script_install_commands.cmake index ab70e2474c..e29cba2585 100644 --- a/cmakemodules/script_install_commands.cmake +++ b/cmakemodules/script_install_commands.cmake @@ -105,7 +105,7 @@ ELSE(WIN32) # applications config files INSTALL(DIRECTORY "${MRPT_SOURCE_DIR}/share/applications" DESTINATION ${mrpt_apps_INSTALL_PREFIX}share) - INSTALL(DIRECTORY "${MRPT_SOURCE_DIR}/share/mrpt" DESTINATION ${mrpt_apps_INSTALL_PREFIX}share) + INSTALL(DIRECTORY "${MRPT_SOURCE_DIR}/share/mrpt" DESTINATION ${mrpt_common_INSTALL_PREFIX}share) INSTALL(DIRECTORY "${MRPT_SOURCE_DIR}/share/pixmaps" DESTINATION ${mrpt_apps_INSTALL_PREFIX}share) INSTALL(DIRECTORY "${MRPT_SOURCE_DIR}/share/appdata" DESTINATION ${mrpt_apps_INSTALL_PREFIX}share) diff --git a/packaging/debian/control.in b/packaging/debian/control.in index cd96eb5342..74ff27acdc 100644 --- a/packaging/debian/control.in +++ b/packaging/debian/control.in @@ -371,10 +371,21 @@ Description: Mobile Robot Programming Toolkit - Debug libraries . This package provides MRPT libraries debug symbols. +Package: mrpt-common +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Mobile Robot Programming Toolkit - Console and GUI applications + The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform, + and open source C++ library aimed to help robotics researchers to design and + implement algorithms in the fields of Simultaneous Localization and Mapping + (SLAM), computer vision, and motion planning (obstacle avoidance). + . + This package provides example datasets and configuration files for several + MRPT applications. Package: mrpt-apps Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: mrpt-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Mobile Robot Programming Toolkit - Console and GUI applications The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform, and open source C++ library aimed to help robotics researchers to design and @@ -409,7 +420,5 @@ Description: Mobile Robot Programming Toolkit - Console and GUI applications - kinect-view: Example 3D mapping with Xbox Kinect - robotic-arm-kinematics: GUI for design of robot arms with Denavit-Hartenberg parameters. - - srba-slam: Sparser Relative Bundle Adjustment (RBA) and - Relative Graph-SLAM. - - prrt-navigator-demo (Experimental!) +