[med-svn] [Git][med-team/xxsds-dynamic][master] 5 commits: Update useOurHopscotchMap.patch for new upstream

Andreas Tille (@tille) gitlab at salsa.debian.org
Sun Oct 25 08:32:12 GMT 2026 


Andreas Tille pushed to branch master at Debian Med / xxsds-dynamic


Commits:
2a10d804 by Andreas Tille at 2026-10-25T09:15:53+01:00
Update useOurHopscotchMap.patch for new upstream

Regenerate the patch against the current CMakeLists so it applies
cleanly, and drop the obsolete cmake_minimum_required hunk.

- - - - -
276c296f by Andreas Tille at 2026-10-25T09:16:01+01:00
Depend on libtsl-hopscotch-map-dev

The packaged headers include <tsl/hopscotch_map.h>, so the binary
package must depend on the hopscotch header package.

- - - - -
e7d1df2d by Andreas Tille at 2026-10-25T09:16:10+01:00
Drop stale libdynamic-dev.install

The binary package is libxxsds-dynamic-dev; this install file is left
over from the old package name and is not used by any package stanza.

- - - - -
ae5a3ee4 by Andreas Tille at 2026-10-25T09:16:15+01:00
Add autopkgtest compiling the packaged headers

The test instantiates the same DYNAMIC types used by libbdsg/vg and
therefore also exercises the hopscotch-map dependency.

- - - - -
aa40fad8 by Andreas Tille at 2026-10-25T09:18:18+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- − debian/libdynamic-dev.install
- debian/patches/useOurHopscotchMap.patch
- + debian/tests/compile
- + debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-xxsds-dynamic (1.0~git20251217.dbd5d4c-1) UNRELEASED; urgency=medium
+xxsds-dynamic (1.0~git20251217.dbd5d4c-1) unstable; urgency=medium
 
   * Team upload.
   * d/watch:
@@ -10,8 +10,12 @@ xxsds-dynamic (1.0~git20251217.dbd5d4c-1) UNRELEASED; urgency=medium
   * Remove Priority field (cme)
   * Drop 'Rules-Requires-Root: no' from d/control (routine-update)
   * Reformat the Last-Update date as ISO YYYY-MM-DD.
+  * Update useOurHopscotchMap.patch for the new upstream CMakeLists.
+  * Add the missing libtsl-hopscotch-map-dev dependency.
+  * Drop the stale libdynamic-dev.install file.
+  * Add an autopkgtest that compiles the installed headers.
 
- -- Andreas Tille <tille at debian.org>  Sun, 25 Oct 2026 07:37:19 +0100
+ -- Andreas Tille <tille at debian.org>  Sun, 25 Oct 2026 09:16:55 +0100
 
 xxsds-dynamic (1.0~alpha.1+git20210426.548c6f7-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -18,6 +18,7 @@ Multi-Arch: foreign
 Section: libdevel
 Depends:
  ${misc:Depends},
+ libtsl-hopscotch-map-dev
 Description: succinct and compressed fully-dynamic data structures library
  This library offers space- and time-efficient implementations of some
  basic succinct/compressed dynamic data structures. It only ships header


=====================================
debian/libdynamic-dev.install deleted
=====================================
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*
-usr/share/pkgconfig/*
-include/dynamic	usr/include/


=====================================
debian/patches/useOurHopscotchMap.patch
=====================================
@@ -1,20 +1,17 @@
 Author: Steffen Moeller <moeller at debian.org>, Nilesh Patra <nilesh at debian.org>
-Last-Update: 2020-07-18
+Last-Update: 2026-10-25
 Description: Use Debian packaged hopscotch_map
 Forwarded: not-needed
+Assisted-By: deepseek-v4.1-flash-free
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.6)
+@@ -12,26 +12,13 @@
  
- option(USE_OPENMP "Enable multi-threading" OFF)
- 
-@@ -14,24 +14,15 @@
- 
- include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+ project (dynamic)
  
+-include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+-
 -# hopscotch_map
 -ExternalProject_Add(hopscotch_map
 -  GIT_REPOSITORY "https://github.com/Tessil/hopscotch-map.git"
@@ -26,7 +23,7 @@ Forwarded: not-needed
 -  CONFIGURE_COMMAND "")
 -ExternalProject_Get_property(hopscotch_map INSTALL_DIR)
 -set(hopscotch_map_INCLUDE "${INSTALL_DIR}/src/hopscotch_map/include/")
-+set(PRIVATE tsl::hopscotch_map_INCLUDE "/usr/include/tsl")
++find_package(tsl-hopscotch-map REQUIRED)
  
  include_directories(${PROJECT_SOURCE_DIR}/include)
  #include_directories(${PROJECT_SOURCE_DIR}/include/dynamic)
@@ -34,12 +31,10 @@ Forwarded: not-needed
  #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/PRIVATE tsl::hopscotch_map/include)
-+find_package(tsl-hopscotch-map REQUIRED)
  
  message("Building in ${CMAKE_BUILD_TYPE} mode")
  
-@@ -56,12 +47,11 @@
+@@ -56,12 +43,12 @@
  add_executable(benchmark benchmark.cpp)
  add_executable(wm_string wm_string.cpp)
  
@@ -51,7 +46,6 @@ Forwarded: not-needed
 -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)
@@ -60,3 +54,4 @@ Forwarded: not-needed
 +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/tests/compile
=====================================
@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+
+cat > test.cpp <<'EOF'
+#include <dynamic/dynamic.hpp>
+
+namespace test {
+typedef dyn::succinct_bitvector<dyn::spsi<dyn::packed_vector,256,16> > suc_bv;
+typedef dyn::lciv<dyn::packed_vector,512,1> lciv_iv;
+typedef dyn::wt_string<dyn::succinct_bitvector<dyn::spsi<dyn::packed_vector,256,16> > > wt_str;
+typedef dyn::hacked_vector suc_iv;
+}
+
+int main() {
+    test::suc_bv a;
+    test::lciv_iv b;
+    test::wt_str c;
+    test::suc_iv d;
+    (void) a;
+    (void) b;
+    (void) c;
+    (void) d;
+    return 0;
+}
+EOF
+
+g++ -std=c++17 -fopenmp -c test.cpp -o test.o


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,2 @@
+Tests: compile
+Depends: @, build-essential



View it on GitLab: https://salsa.debian.org/med-team/xxsds-dynamic/-/compare/6626dc6b7839e0987dac49272a0cfb3e322c59a1...aa40fad8bd3f3a1a485b1f9f41b6f8b1b4d88ff7

-- 
View it on GitLab: https://salsa.debian.org/med-team/xxsds-dynamic/-/compare/6626dc6b7839e0987dac49272a0cfb3e322c59a1...aa40fad8bd3f3a1a485b1f9f41b6f8b1b4d88ff7
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261025/db3d2210/attachment-0001.htm>

More information about the debian-med-commit mailing list