Skip to content

Commit

Permalink
debian: mrpt-apps split in 2
Browse files Browse the repository at this point in the history
New arch-indep pkg mrpt-common with all dataset & sample files, to better follow Debian rules and avoid Lintian complaints.
  • Loading branch information
jlblancoc committed Nov 3, 2015
1 parent e138bd6 commit 880ca37
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmakemodules/script_install_commands.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
17 changes: 13 additions & 4 deletions packaging/debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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!)


0 comments on commit 880ca37

Please sign in to comment.