Nilesh Patra pushed to branch master at Debian Med / xxsds-dynamic
Commits: 1cfc9ce7 by Nilesh Patra at 2023-08-25T07:18:27+00:00 Adjust useOurHopscotchMap.patch to be compatible with existing hopscotch - - - - - 263f7588 by Nilesh Patra at 2023-08-25T12:59:55+05:30 Update d/u/metadata - - - - - 4e9c1210 by Nilesh Patra at 2023-08-25T12:59:55+05:30 Bump Standards-Version to 4.6.2 (no changes needed) - - - - - 85a00601 by Nilesh Patra at 2023-08-25T12:59:55+05:30 DEP3 - - - - - dad71522 by Nilesh Patra at 2023-08-25T12:59:55+05:30 Update copyright years - - - - - 9342680e by Nilesh Patra at 2023-08-25T12:59:55+05:30 Upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - debian/copyright - debian/patches/useOurHopscotchMap.patch - debian/upstream/metadata Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +xxsds-dynamic (1.0~alpha.1+git20210426.548c6f7-2) unstable; urgency=medium + + * Team Upload. + * Adjust useOurHopscotchMap.patch to be compatible with existing hopscotch + Closes: #1042340 + * Update d/u/metadata + * Bump Standards-Version to 4.6.2 (no changes needed) + * Update copyright years + + -- Nilesh Patra <[email protected]> Fri, 25 Aug 2023 12:51:19 +0530 + xxsds-dynamic (1.0~alpha.1+git20210426.548c6f7-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -5,7 +5,7 @@ Uploaders: Steffen Moeller <[email protected]> Build-Depends: debhelper-compat (= 13), cmake, libtsl-hopscotch-map-dev -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Section: libs Vcs-Browser: https://salsa.debian.org/med-team/xxsds-dynamic Vcs-Git: https://salsa.debian.org/med-team/xxsds-dynamic.git ===================================== debian/copyright ===================================== @@ -17,7 +17,7 @@ Copyright: 2019 Nicola Prezza <[email protected]> License: MIT Files: debian/* -Copyright: 2020 Steffen Moeller <[email protected]> +Copyright: 2020-2023 Steffen Moeller <[email protected]> License: MIT License: MIT ===================================== debian/patches/useOurHopscotchMap.patch ===================================== @@ -1,12 +1,16 @@ -Author: Steffen Moeller <[email protected]> +Author: Steffen Moeller <[email protected]>, Nilesh Patra <[email protected]> Last-Update: Sat, 18 Jul 2020 16:40:45 +0200 Description: Use Debian packaged hopscotch_map - -Index: xxsds-dynamic/CMakeLists.txt -=================================================================== ---- xxsds-dynamic.orig/CMakeLists.txt -+++ xxsds-dynamic/CMakeLists.txt -@@ -14,24 +14,14 @@ project (dynamic) +Forwarded: not-needed +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.6) + + option(USE_OPENMP "Enable multi-threading" OFF) + +@@ -14,24 +14,15 @@ include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) @@ -21,7 +25,7 @@ Index: xxsds-dynamic/CMakeLists.txt - CONFIGURE_COMMAND "") -ExternalProject_Get_property(hopscotch_map INSTALL_DIR) -set(hopscotch_map_INCLUDE "${INSTALL_DIR}/src/hopscotch_map/include/") -+set(hopscotch_map_INCLUDE "/usr/include/tsl") ++set(PRIVATE tsl::hopscotch_map_INCLUDE "/usr/include/tsl") include_directories(${PROJECT_SOURCE_DIR}/include) #include_directories(${PROJECT_SOURCE_DIR}/include/dynamic) @@ -29,7 +33,29 @@ Index: xxsds-dynamic/CMakeLists.txt #include_directories(${PROJECT_SOURCE_DIR}/include/dynamic/algorithms) #include_directories(${PROJECT_SOURCE_DIR}/include/dynamic/algorithms/cw-bwt) -include_directories(${INSTALL_DIR}/src/hopscotch_map/include) -+#include_directories(${INSTALL_DIR}/src/hopscotch_map/include) ++#include_directories(${INSTALL_DIR}/src/PRIVATE tsl::hopscotch_map/include) ++find_package(tsl-hopscotch-map REQUIRED) message("Building in ${CMAKE_BUILD_TYPE} mode") +@@ -56,12 +47,11 @@ + add_executable(benchmark benchmark.cpp) + add_executable(wm_string wm_string.cpp) + +-add_dependencies(debug hopscotch_map) +-add_dependencies(rle_lz77_v1 hopscotch_map) +-add_dependencies(rle_lz77_v2 hopscotch_map) +-add_dependencies(h0_lz77 hopscotch_map) +-add_dependencies(rle_bwt hopscotch_map) +-add_dependencies(cw-bwt hopscotch_map) +-add_dependencies(benchmark hopscotch_map) +-add_dependencies(wm_string hopscotch_map) +- ++target_link_libraries(debug PRIVATE tsl::hopscotch_map) ++target_link_libraries(rle_lz77_v1 PRIVATE tsl::hopscotch_map) ++target_link_libraries(rle_lz77_v2 PRIVATE tsl::hopscotch_map) ++target_link_libraries(h0_lz77 PRIVATE tsl::hopscotch_map) ++target_link_libraries(rle_bwt PRIVATE tsl::hopscotch_map) ++target_link_libraries(cw-bwt PRIVATE tsl::hopscotch_map) ++target_link_libraries(benchmark PRIVATE tsl::hopscotch_map) ++target_link_libraries(wm_string PRIVATE tsl::hopscotch_map) ===================================== debian/upstream/metadata ===================================== @@ -1,3 +1,7 @@ --- +Archive: GitHub Bug-Database: https://github.com/xxsds/DYNAMIC/issues Bug-Submit: https://github.com/xxsds/DYNAMIC/issues/new +Changelog: https://github.com/xxsds/DYNAMIC/tags +Repository: https://github.com/xxsds/DYNAMIC.git +Repository-Browse: https://github.com/xxsds/DYNAMIC View it on GitLab: https://salsa.debian.org/med-team/xxsds-dynamic/-/compare/8e74cdc1b7c31209c14dd30a8646ce30668866e7...9342680eeeecf2691f1ee3272bae42c6363ea2a7 -- View it on GitLab: https://salsa.debian.org/med-team/xxsds-dynamic/-/compare/8e74cdc1b7c31209c14dd30a8646ce30668866e7...9342680eeeecf2691f1ee3272bae42c6363ea2a7 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
