diff --git a/hatptester/Makefile b/hatptester/Makefile index 3cdd6cd30806b8c743b51130367a4ca0e7fad125..48cbcea34d0368aeb924b0ff8ef9d1888ac2110d 100644 --- a/hatptester/Makefile +++ b/hatptester/Makefile @@ -3,7 +3,7 @@ # DISTNAME= hatptester-${VERSION} -VERSION= 1.5.1 +VERSION= 1.5.2 PKGREVISION= 1 CATEGORIES= planning MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hatptester/} diff --git a/hatptester/depend.mk b/hatptester/depend.mk index f89d838617686e8bc0795a918241567791a608ad..1d3d9fc80d34529a6122d0e300a60632a487ea25 100644 --- a/hatptester/depend.mk +++ b/hatptester/depend.mk @@ -14,7 +14,7 @@ PREFER.hatpconsole?= robotpkg DEPEND_USE+= hatptester -DEPEND_ABI.hatptester?= hatptester>=1.5.1 +DEPEND_ABI.hatptester?= hatptester>=1.5.2 DEPEND_DIR.hatptester?= ../../wip/hatptester SYSTEM_SEARCH.hatptester=\ diff --git a/hatptester/distinfo b/hatptester/distinfo index f134bebd98428244ad9bb621d3a82e07028d5c8f..9908041fe5804ce69c3ba1044f08b48064f95f9e 100644 --- a/hatptester/distinfo +++ b/hatptester/distinfo @@ -1,4 +1,3 @@ -SHA1 (hatptester-1.5.1.tar.gz) = eef1f3fbdf785b27ed06394e482959a0f502c70e -RMD160 (hatptester-1.5.1.tar.gz) = 42f12fea553c5d58fc7f9a8fe4d7fb83397d6063 -Size (hatptester-1.5.1.tar.gz) = 20942 bytes -SHA1 (patch-aa) = 8f7a581b19bb0a62f2f86642dc2bb298a49cf038 +SHA1 (hatptester-1.5.2.tar.gz) = 11b097870a689453d6bd22297cf0c1c6789e37b0 +RMD160 (hatptester-1.5.2.tar.gz) = bf730b8957cb482e69b1d5dc6b358d6d8d1dcc2c +Size (hatptester-1.5.2.tar.gz) = 20943 bytes diff --git a/hatptester/patches/patch-aa b/hatptester/patches/patch-aa deleted file mode 100644 index 8148f44ca86468fdccfa4229c52ad3efb8b30245..0000000000000000000000000000000000000000 --- a/hatptester/patches/patch-aa +++ /dev/null @@ -1,26 +0,0 @@ -diff --git CMakeLists.txt CMakeLists.txt -index d790cec..91b7553 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -14,7 +14,7 @@ set(APP_ASSOCIATED_TAG "v${APP_VERSION}") #Tag associated to the software versio - - find_package(msgconnector REQUIRED msgconnector) - find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui) --find_package(Boost REQUIRED thread regex signals program_options system) -+find_package(Boost REQUIRED thread regex signals program_options system date_time) - find_package(Threads) - - if(msgconnector_FOUND) -diff --git logger/CMakeLists.txt logger/CMakeLists.txt -index 403a1bb..7236d3c 100644 ---- logger/CMakeLists.txt -+++ logger/CMakeLists.txt -@@ -22,7 +22,7 @@ if(ENABLE_LOGGER) - include_directories(${Boost_INCLUDE_DIRS} ${boost-log_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) - - add_library(logger SHARED ${PROJECT_SOURCE_DIR}/logger/logger.cpp) -- target_link_libraries(logger boost_regex-mt boost_date_time-mt ${boost-log_LIBRARIES}) -+ target_link_libraries(logger ${boost_LIBRARIES} ${boost-log_LIBRARIES}) - set_target_properties(logger PROPERTIES COMPILE_DEFINITIONS "LOGGER_ENABLED") - - install(TARGETS logger LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)