From 96a8a2686fc51c4770a2cdd21897943a6269b569 Mon Sep 17 00:00:00 2001 From: Francisco Perez Date: Tue, 24 Oct 2017 03:50:28 -0700 Subject: [PATCH 1/3] [issue #941]Renamed samples to examples --- cmake/cpack_metainfo/drivers.cmake | 5 +++++ cmake/cpack_metainfo/tools.cmake | 6 ++++++ cmake/cpackit.cmake | 1 + scripts/metapackages/jderobot-examples.info.in | 17 +++++++++++++++++ scripts/metapackages/jderobot.info.in | 2 +- src/CMakeLists.txt | 2 +- src/{samples => examples}/CMakeLists.txt | 0 .../basic_component/CMakeLists.txt | 0 .../basic_component/basic_component.cpp | 0 .../basic_component/basic_component.yml | 0 .../basic_component/gui/gui.cpp | 0 .../basic_component/gui/gui.h | 0 .../basic_component/gui/threadupdategui.cpp | 0 .../basic_component/gui/threadupdategui.h | 0 .../gui/widget/cameraswidget.cpp | 0 .../basic_component/gui/widget/cameraswidget.h | 0 .../basic_component/gui/widget/controlvw.cpp | 0 .../basic_component/gui/widget/controlvw.h | 0 .../basic_component_py/CMakeLists.txt | 0 .../basic_component_py/basic_component.py | 0 .../basic_component_py/basic_component_py.in | 0 .../basic_component_py/basic_component_py.yml | 0 .../basic_component_py/generateGUI | 0 .../basic_component_py/gui/GUI.py | 0 .../basic_component_py/gui/__init__.py | 0 .../basic_component_py/gui/cameraWidget.py | 0 .../basic_component_py/gui/communicator.py | 0 .../basic_component_py/gui/logoWidget.py | 0 .../basic_component_py/gui/teleopWidget.py | 0 .../basic_component_py/gui/threadGUI.py | 0 .../basic_component_py/gui/ui_gui.py | 0 .../basic_component_py/gui/ui_gui.ui | 0 .../basic_component_py/resources/__init__.py | 0 .../basic_component_py/resources/ball.png | Bin .../basic_component_py/resources/jderobot.svg | 0 .../basic_component_py/resources/resources.qrc | 0 .../basic_component_py/resources_rc.py | 0 .../basic_server/.gitignore | 0 .../basic_server/CMakeLists.txt | 4 ++-- .../basic_server/basic_server.cfg | 0 .../basic_server/basic_server.cpp | 0 .../basic_server/myInterface.ice | 0 .../opencvdemo/CMakeLists.txt | 6 +++--- src/{samples => examples}/opencvdemo/makefile | 0 .../opencvdemo/opencvdemo.cfg | 0 .../opencvdemo/opencvdemo.cpp | 0 .../opencvdemo/opencvdemo.glade | 0 .../opencvdemo/viewer.cpp | 0 src/{samples => examples}/opencvdemo/viewer.h | 0 49 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 scripts/metapackages/jderobot-examples.info.in rename src/{samples => examples}/CMakeLists.txt (100%) rename src/{samples => examples}/basic_component/CMakeLists.txt (100%) rename src/{samples => examples}/basic_component/basic_component.cpp (100%) rename src/{samples => examples}/basic_component/basic_component.yml (100%) rename src/{samples => examples}/basic_component/gui/gui.cpp (100%) rename src/{samples => examples}/basic_component/gui/gui.h (100%) rename src/{samples => examples}/basic_component/gui/threadupdategui.cpp (100%) rename src/{samples => examples}/basic_component/gui/threadupdategui.h (100%) rename src/{samples => examples}/basic_component/gui/widget/cameraswidget.cpp (100%) rename src/{samples => examples}/basic_component/gui/widget/cameraswidget.h (100%) rename src/{samples => examples}/basic_component/gui/widget/controlvw.cpp (100%) rename src/{samples => examples}/basic_component/gui/widget/controlvw.h (100%) rename src/{samples => examples}/basic_component_py/CMakeLists.txt (100%) rename src/{samples => examples}/basic_component_py/basic_component.py (100%) rename src/{samples => examples}/basic_component_py/basic_component_py.in (100%) rename src/{samples => examples}/basic_component_py/basic_component_py.yml (100%) rename src/{samples => examples}/basic_component_py/generateGUI (100%) rename src/{samples => examples}/basic_component_py/gui/GUI.py (100%) rename src/{samples => examples}/basic_component_py/gui/__init__.py (100%) rename src/{samples => examples}/basic_component_py/gui/cameraWidget.py (100%) rename src/{samples => examples}/basic_component_py/gui/communicator.py (100%) rename src/{samples => examples}/basic_component_py/gui/logoWidget.py (100%) rename src/{samples => examples}/basic_component_py/gui/teleopWidget.py (100%) rename src/{samples => examples}/basic_component_py/gui/threadGUI.py (100%) rename src/{samples => examples}/basic_component_py/gui/ui_gui.py (100%) rename src/{samples => examples}/basic_component_py/gui/ui_gui.ui (100%) rename src/{samples => examples}/basic_component_py/resources/__init__.py (100%) rename src/{samples => examples}/basic_component_py/resources/ball.png (100%) rename src/{samples => examples}/basic_component_py/resources/jderobot.svg (100%) rename src/{samples => examples}/basic_component_py/resources/resources.qrc (100%) rename src/{samples => examples}/basic_component_py/resources_rc.py (100%) rename src/{samples => examples}/basic_server/.gitignore (100%) rename src/{samples => examples}/basic_server/CMakeLists.txt (87%) rename src/{samples => examples}/basic_server/basic_server.cfg (100%) rename src/{samples => examples}/basic_server/basic_server.cpp (100%) rename src/{samples => examples}/basic_server/myInterface.ice (100%) rename src/{samples => examples}/opencvdemo/CMakeLists.txt (85%) rename src/{samples => examples}/opencvdemo/makefile (100%) rename src/{samples => examples}/opencvdemo/opencvdemo.cfg (100%) rename src/{samples => examples}/opencvdemo/opencvdemo.cpp (100%) rename src/{samples => examples}/opencvdemo/opencvdemo.glade (100%) rename src/{samples => examples}/opencvdemo/viewer.cpp (100%) rename src/{samples => examples}/opencvdemo/viewer.h (100%) diff --git a/cmake/cpack_metainfo/drivers.cmake b/cmake/cpack_metainfo/drivers.cmake index c43a9a4d9..75badd506 100644 --- a/cmake/cpack_metainfo/drivers.cmake +++ b/cmake/cpack_metainfo/drivers.cmake @@ -4,6 +4,11 @@ SET(CPACK_COMPONENT_ARDRONE-SERVER_DESCRIPTION Manual page http://jderobot.org/index.php/Drivers#ardrone_server Home page https://jderobot.org") +SET(CPACK_DEBIAN_BASIC-SERVER_PACKAGE_DEPENDS "jderobot-easyice, jderobot-interfaces, jderobot-colorspaces") +SET(CPACK_COMPONENT_ARDRONE-SERVER_DESCRIPTION +"An example of the most basic server made for JdeRobot based on ICE communications. + Home page https://jderobot.org") + SET(CPACK_DEBIAN_CAMERASERVER_DEPENDS "jderobot-easyice, jderobot-util, jderobot-interfaces, jderobot-logger, jderobot-ns, jderobot-colorspaces") SET(CPACK_COMPONENT_CAMERASERVER_DESCRIPTION "Generic server for RGB cameras. diff --git a/cmake/cpack_metainfo/tools.cmake b/cmake/cpack_metainfo/tools.cmake index b04eec457..ed4abd8ed 100644 --- a/cmake/cpack_metainfo/tools.cmake +++ b/cmake/cpack_metainfo/tools.cmake @@ -70,6 +70,12 @@ SET(CPACK_COMPONENT_NAVIGATORCAMERA_DESCRIPTION Manual Page http://jderobot.org/index.php/Tools#NavigatorCamera Home page https://jderobot.org") +SET(CPACK_DEBIAN_OPENCVDEMO_PACKAGE_DEPENDS "jderobot-easyice, jderobot-parallelice, jderobot-util, jderobot-interfaces, jderobot-resourcelocator, jderobot-colorspaces") +SET(CPACK_COMPONENT_NAVIGATORCAMERA_DESCRIPTION +"An example of a tool made for image treatment using OpenCV. + Manual Page http://jderobot.org/index.php/Tools#NavigatorCamera + Home page https://jderobot.org") + SET(CPACK_DEBIAN_RECORDER2_PACKAGE_DEPENDS "jderobot-easyice, jderobot-util, jderobot-interfaces, jderobot-ns, jderobot-colorspaces") SET(CPACK_COMPONENT_RECORDER2_DESCRIPTION "Tool for record logs of robots sensors and actuators. diff --git a/cmake/cpackit.cmake b/cmake/cpackit.cmake index f3814ffdf..dcfa26e32 100644 --- a/cmake/cpackit.cmake +++ b/cmake/cpackit.cmake @@ -135,6 +135,7 @@ configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-deps-dev.info.in ${CMAKE_BINA configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-libs.info.in ${CMAKE_BINARY_DIR}/jderobot-libs_${PACKAGE_VERSION}_all.info) configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-tools.info.in ${CMAKE_BINARY_DIR}/jderobot-tools_${PACKAGE_VERSION}_all.info) configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-drivers.info.in ${CMAKE_BINARY_DIR}/jderobot-drivers_${PACKAGE_VERSION}_all.info) +configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-examples.info.in ${CMAKE_BINARY_DIR}/jderobot-drivers_${PACKAGE_VERSION}_all.info) configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-zeroc-ice-python.info.in ${CMAKE_BINARY_DIR}/jderobot-zeroc-ice-python_${PACKAGE_VERSION}_all.info) execute_process( diff --git a/scripts/metapackages/jderobot-examples.info.in b/scripts/metapackages/jderobot-examples.info.in new file mode 100644 index 000000000..47708880e --- /dev/null +++ b/scripts/metapackages/jderobot-examples.info.in @@ -0,0 +1,17 @@ +Package: ${PROJECT_NAME}-examples +Version: ${PACKAGE_VERSION} +Architecture: all +Provides: ${PROJECT_NAME}-examples +Conflicts: ${PROJECT_NAME}-examples +Replaces: ${PROJECT_NAME}-examples +Section: net +Priority: extra +Size: 0 +Installed-Size: 0 +Depends: jderobot-basic-component, jderobot-basic-component-python, jderobot-basic-server, jderobot-opencvdemo +Maintainer: Francisco Perez +Homepage: http://jderobot.org +Description: Metapackage that gathers all the examples of JdeRobot framework. + Jderobot is a software development suite for robotics applications. + Get it from https://github.com/JdeRobot/JdeRobot.git + diff --git a/scripts/metapackages/jderobot.info.in b/scripts/metapackages/jderobot.info.in index aa79963ba..071dfb37d 100644 --- a/scripts/metapackages/jderobot.info.in +++ b/scripts/metapackages/jderobot.info.in @@ -8,7 +8,7 @@ Priority: extra Section: net Size: 0 Installed-Size: 0 -Depends: ${PACKAGE_DEPENDS}, jderobot-tools, jderobot-libs, jderobot-drivers, jderobot-interfaces, jderobot-types +Depends: ${PACKAGE_DEPENDS}, jderobot-tools, jderobot-libs, jderobot-drivers, jderobot-interfaces, jderobot-types, jderobot-examples Maintainer: Francisco Perez Homepage: http://jderobot.org Description: Metapackage that gathers all libraries required by JdeRobot framework, and install the proyect for execution only. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b6712d05a..318d574cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,4 +3,4 @@ add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/types) add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/libs) add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/tools) add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/drivers) -add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/samples) +add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/examples) diff --git a/src/samples/CMakeLists.txt b/src/examples/CMakeLists.txt similarity index 100% rename from src/samples/CMakeLists.txt rename to src/examples/CMakeLists.txt diff --git a/src/samples/basic_component/CMakeLists.txt b/src/examples/basic_component/CMakeLists.txt similarity index 100% rename from src/samples/basic_component/CMakeLists.txt rename to src/examples/basic_component/CMakeLists.txt diff --git a/src/samples/basic_component/basic_component.cpp b/src/examples/basic_component/basic_component.cpp similarity index 100% rename from src/samples/basic_component/basic_component.cpp rename to src/examples/basic_component/basic_component.cpp diff --git a/src/samples/basic_component/basic_component.yml b/src/examples/basic_component/basic_component.yml similarity index 100% rename from src/samples/basic_component/basic_component.yml rename to src/examples/basic_component/basic_component.yml diff --git a/src/samples/basic_component/gui/gui.cpp b/src/examples/basic_component/gui/gui.cpp similarity index 100% rename from src/samples/basic_component/gui/gui.cpp rename to src/examples/basic_component/gui/gui.cpp diff --git a/src/samples/basic_component/gui/gui.h b/src/examples/basic_component/gui/gui.h similarity index 100% rename from src/samples/basic_component/gui/gui.h rename to src/examples/basic_component/gui/gui.h diff --git a/src/samples/basic_component/gui/threadupdategui.cpp b/src/examples/basic_component/gui/threadupdategui.cpp similarity index 100% rename from src/samples/basic_component/gui/threadupdategui.cpp rename to src/examples/basic_component/gui/threadupdategui.cpp diff --git a/src/samples/basic_component/gui/threadupdategui.h b/src/examples/basic_component/gui/threadupdategui.h similarity index 100% rename from src/samples/basic_component/gui/threadupdategui.h rename to src/examples/basic_component/gui/threadupdategui.h diff --git a/src/samples/basic_component/gui/widget/cameraswidget.cpp b/src/examples/basic_component/gui/widget/cameraswidget.cpp similarity index 100% rename from src/samples/basic_component/gui/widget/cameraswidget.cpp rename to src/examples/basic_component/gui/widget/cameraswidget.cpp diff --git a/src/samples/basic_component/gui/widget/cameraswidget.h b/src/examples/basic_component/gui/widget/cameraswidget.h similarity index 100% rename from src/samples/basic_component/gui/widget/cameraswidget.h rename to src/examples/basic_component/gui/widget/cameraswidget.h diff --git a/src/samples/basic_component/gui/widget/controlvw.cpp b/src/examples/basic_component/gui/widget/controlvw.cpp similarity index 100% rename from src/samples/basic_component/gui/widget/controlvw.cpp rename to src/examples/basic_component/gui/widget/controlvw.cpp diff --git a/src/samples/basic_component/gui/widget/controlvw.h b/src/examples/basic_component/gui/widget/controlvw.h similarity index 100% rename from src/samples/basic_component/gui/widget/controlvw.h rename to src/examples/basic_component/gui/widget/controlvw.h diff --git a/src/samples/basic_component_py/CMakeLists.txt b/src/examples/basic_component_py/CMakeLists.txt similarity index 100% rename from src/samples/basic_component_py/CMakeLists.txt rename to src/examples/basic_component_py/CMakeLists.txt diff --git a/src/samples/basic_component_py/basic_component.py b/src/examples/basic_component_py/basic_component.py similarity index 100% rename from src/samples/basic_component_py/basic_component.py rename to src/examples/basic_component_py/basic_component.py diff --git a/src/samples/basic_component_py/basic_component_py.in b/src/examples/basic_component_py/basic_component_py.in similarity index 100% rename from src/samples/basic_component_py/basic_component_py.in rename to src/examples/basic_component_py/basic_component_py.in diff --git a/src/samples/basic_component_py/basic_component_py.yml b/src/examples/basic_component_py/basic_component_py.yml similarity index 100% rename from src/samples/basic_component_py/basic_component_py.yml rename to src/examples/basic_component_py/basic_component_py.yml diff --git a/src/samples/basic_component_py/generateGUI b/src/examples/basic_component_py/generateGUI similarity index 100% rename from src/samples/basic_component_py/generateGUI rename to src/examples/basic_component_py/generateGUI diff --git a/src/samples/basic_component_py/gui/GUI.py b/src/examples/basic_component_py/gui/GUI.py similarity index 100% rename from src/samples/basic_component_py/gui/GUI.py rename to src/examples/basic_component_py/gui/GUI.py diff --git a/src/samples/basic_component_py/gui/__init__.py b/src/examples/basic_component_py/gui/__init__.py similarity index 100% rename from src/samples/basic_component_py/gui/__init__.py rename to src/examples/basic_component_py/gui/__init__.py diff --git a/src/samples/basic_component_py/gui/cameraWidget.py b/src/examples/basic_component_py/gui/cameraWidget.py similarity index 100% rename from src/samples/basic_component_py/gui/cameraWidget.py rename to src/examples/basic_component_py/gui/cameraWidget.py diff --git a/src/samples/basic_component_py/gui/communicator.py b/src/examples/basic_component_py/gui/communicator.py similarity index 100% rename from src/samples/basic_component_py/gui/communicator.py rename to src/examples/basic_component_py/gui/communicator.py diff --git a/src/samples/basic_component_py/gui/logoWidget.py b/src/examples/basic_component_py/gui/logoWidget.py similarity index 100% rename from src/samples/basic_component_py/gui/logoWidget.py rename to src/examples/basic_component_py/gui/logoWidget.py diff --git a/src/samples/basic_component_py/gui/teleopWidget.py b/src/examples/basic_component_py/gui/teleopWidget.py similarity index 100% rename from src/samples/basic_component_py/gui/teleopWidget.py rename to src/examples/basic_component_py/gui/teleopWidget.py diff --git a/src/samples/basic_component_py/gui/threadGUI.py b/src/examples/basic_component_py/gui/threadGUI.py similarity index 100% rename from src/samples/basic_component_py/gui/threadGUI.py rename to src/examples/basic_component_py/gui/threadGUI.py diff --git a/src/samples/basic_component_py/gui/ui_gui.py b/src/examples/basic_component_py/gui/ui_gui.py similarity index 100% rename from src/samples/basic_component_py/gui/ui_gui.py rename to src/examples/basic_component_py/gui/ui_gui.py diff --git a/src/samples/basic_component_py/gui/ui_gui.ui b/src/examples/basic_component_py/gui/ui_gui.ui similarity index 100% rename from src/samples/basic_component_py/gui/ui_gui.ui rename to src/examples/basic_component_py/gui/ui_gui.ui diff --git a/src/samples/basic_component_py/resources/__init__.py b/src/examples/basic_component_py/resources/__init__.py similarity index 100% rename from src/samples/basic_component_py/resources/__init__.py rename to src/examples/basic_component_py/resources/__init__.py diff --git a/src/samples/basic_component_py/resources/ball.png b/src/examples/basic_component_py/resources/ball.png similarity index 100% rename from src/samples/basic_component_py/resources/ball.png rename to src/examples/basic_component_py/resources/ball.png diff --git a/src/samples/basic_component_py/resources/jderobot.svg b/src/examples/basic_component_py/resources/jderobot.svg similarity index 100% rename from src/samples/basic_component_py/resources/jderobot.svg rename to src/examples/basic_component_py/resources/jderobot.svg diff --git a/src/samples/basic_component_py/resources/resources.qrc b/src/examples/basic_component_py/resources/resources.qrc similarity index 100% rename from src/samples/basic_component_py/resources/resources.qrc rename to src/examples/basic_component_py/resources/resources.qrc diff --git a/src/samples/basic_component_py/resources_rc.py b/src/examples/basic_component_py/resources_rc.py similarity index 100% rename from src/samples/basic_component_py/resources_rc.py rename to src/examples/basic_component_py/resources_rc.py diff --git a/src/samples/basic_server/.gitignore b/src/examples/basic_server/.gitignore similarity index 100% rename from src/samples/basic_server/.gitignore rename to src/examples/basic_server/.gitignore diff --git a/src/samples/basic_server/CMakeLists.txt b/src/examples/basic_server/CMakeLists.txt similarity index 87% rename from src/samples/basic_server/CMakeLists.txt rename to src/examples/basic_server/CMakeLists.txt index 6aa7083a5..cead34dee 100644 --- a/src/samples/basic_server/CMakeLists.txt +++ b/src/examples/basic_server/CMakeLists.txt @@ -31,7 +31,7 @@ TARGET_LINK_LIBRARIES(basic_server install(TARGETS basic_server DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ - COMPONENT samples + COMPONENT basic-server ) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT samples) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT basic-server) diff --git a/src/samples/basic_server/basic_server.cfg b/src/examples/basic_server/basic_server.cfg similarity index 100% rename from src/samples/basic_server/basic_server.cfg rename to src/examples/basic_server/basic_server.cfg diff --git a/src/samples/basic_server/basic_server.cpp b/src/examples/basic_server/basic_server.cpp similarity index 100% rename from src/samples/basic_server/basic_server.cpp rename to src/examples/basic_server/basic_server.cpp diff --git a/src/samples/basic_server/myInterface.ice b/src/examples/basic_server/myInterface.ice similarity index 100% rename from src/samples/basic_server/myInterface.ice rename to src/examples/basic_server/myInterface.ice diff --git a/src/samples/opencvdemo/CMakeLists.txt b/src/examples/opencvdemo/CMakeLists.txt similarity index 85% rename from src/samples/opencvdemo/CMakeLists.txt rename to src/examples/opencvdemo/CMakeLists.txt index aaa49ce2d..207fc9557 100644 --- a/src/samples/opencvdemo/CMakeLists.txt +++ b/src/examples/opencvdemo/CMakeLists.txt @@ -38,8 +38,8 @@ TARGET_LINK_LIBRARIES(opencvdemo install(TARGETS opencvdemo DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ - COMPONENT samples + COMPONENT opencvdemo ) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT samples) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT samples) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT opencvdemo) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT opencvdemo) diff --git a/src/samples/opencvdemo/makefile b/src/examples/opencvdemo/makefile similarity index 100% rename from src/samples/opencvdemo/makefile rename to src/examples/opencvdemo/makefile diff --git a/src/samples/opencvdemo/opencvdemo.cfg b/src/examples/opencvdemo/opencvdemo.cfg similarity index 100% rename from src/samples/opencvdemo/opencvdemo.cfg rename to src/examples/opencvdemo/opencvdemo.cfg diff --git a/src/samples/opencvdemo/opencvdemo.cpp b/src/examples/opencvdemo/opencvdemo.cpp similarity index 100% rename from src/samples/opencvdemo/opencvdemo.cpp rename to src/examples/opencvdemo/opencvdemo.cpp diff --git a/src/samples/opencvdemo/opencvdemo.glade b/src/examples/opencvdemo/opencvdemo.glade similarity index 100% rename from src/samples/opencvdemo/opencvdemo.glade rename to src/examples/opencvdemo/opencvdemo.glade diff --git a/src/samples/opencvdemo/viewer.cpp b/src/examples/opencvdemo/viewer.cpp similarity index 100% rename from src/samples/opencvdemo/viewer.cpp rename to src/examples/opencvdemo/viewer.cpp diff --git a/src/samples/opencvdemo/viewer.h b/src/examples/opencvdemo/viewer.h similarity index 100% rename from src/samples/opencvdemo/viewer.h rename to src/examples/opencvdemo/viewer.h From 705fdf10fceef8175656bca34f486d205852418d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20P=C3=A9rez?= Date: Tue, 24 Oct 2017 12:51:46 +0200 Subject: [PATCH 2/3] Update drivers.cmake --- cmake/cpack_metainfo/drivers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cpack_metainfo/drivers.cmake b/cmake/cpack_metainfo/drivers.cmake index 75badd506..bfa07480f 100644 --- a/cmake/cpack_metainfo/drivers.cmake +++ b/cmake/cpack_metainfo/drivers.cmake @@ -5,7 +5,7 @@ SET(CPACK_COMPONENT_ARDRONE-SERVER_DESCRIPTION Home page https://jderobot.org") SET(CPACK_DEBIAN_BASIC-SERVER_PACKAGE_DEPENDS "jderobot-easyice, jderobot-interfaces, jderobot-colorspaces") -SET(CPACK_COMPONENT_ARDRONE-SERVER_DESCRIPTION +SET(CPACK_COMPONENT_BASIC-SERVER_DESCRIPTION "An example of the most basic server made for JdeRobot based on ICE communications. Home page https://jderobot.org") From 85ffab63220780b596dac1212cb40ee96c742e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20P=C3=A9rez?= Date: Tue, 24 Oct 2017 12:52:09 +0200 Subject: [PATCH 3/3] Update tools.cmake --- cmake/cpack_metainfo/tools.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cpack_metainfo/tools.cmake b/cmake/cpack_metainfo/tools.cmake index ed4abd8ed..ccb59354f 100644 --- a/cmake/cpack_metainfo/tools.cmake +++ b/cmake/cpack_metainfo/tools.cmake @@ -71,7 +71,7 @@ SET(CPACK_COMPONENT_NAVIGATORCAMERA_DESCRIPTION Home page https://jderobot.org") SET(CPACK_DEBIAN_OPENCVDEMO_PACKAGE_DEPENDS "jderobot-easyice, jderobot-parallelice, jderobot-util, jderobot-interfaces, jderobot-resourcelocator, jderobot-colorspaces") -SET(CPACK_COMPONENT_NAVIGATORCAMERA_DESCRIPTION +SET(CPACK_COMPONENT_OPENCVDEMO_DESCRIPTION "An example of a tool made for image treatment using OpenCV. Manual Page http://jderobot.org/index.php/Tools#NavigatorCamera Home page https://jderobot.org")