[med-svn] [Git][med-team/btllib][master] 3 commits: Rebase patches for btllib 1.8.0

Andreas Tille (@tille) gitlab at salsa.debian.org
Thu Oct 22 08:30:13 BST 2026 


Andreas Tille pushed to branch master at Debian Med / btllib


Commits:
86a8673b by Andreas Tille at 2026-10-22T09:16:08+02:00
Rebase patches for btllib 1.8.0

Refresh the meson build patches for the new upstream version, including
the new aarch64 cmake options that no longer apply when using the
system libs.

- - - - -
52102dc2 by Andreas Tille at 2026-10-22T09:16:40+02:00
Make libsdsl-dev a hard dependency of libbtllib-dev

btllib's public headers include sdsl headers and its static library
references sdsl symbols, so the development package cannot be used
without libsdsl-dev.  The package is only built on 64-bit
architectures, where libsdsl-dev is available.

- - - - -
df143005 by Andreas Tille at 2026-10-22T09:21:49+02:00
No need to use dh-exec any more

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libbtllib-dev.install
- debian/patches/find_object_files_at_right_loc.patch
- debian/patches/use_debian_packaged_libs.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,8 @@ btllib (1.8.0+dfsg-1) UNRELEASED; urgency=medium
 
   * d/watch: version=5
   * New upstream version
+  * Rebase patches for btllib 1.8.0
+  * Make libsdsl-dev a hard dependency of libbtllib-dev
   * Standards-Version: 4.7.4 (routine-update)
   * Reflow Uploaders field (cme)
   * Remove Priority field (cme)
@@ -9,6 +11,7 @@ btllib (1.8.0+dfsg-1) UNRELEASED; urgency=medium
   * Reformat the Last-Update date as ISO YYYY-MM-DD.
   * Set upstream metadata fields: Repository, Repository-Browse.
   * debputy lint --auto-fix (routine-update)
+  * No need to use dh-exec any more
 
  -- Andreas Tille <tille at debian.org>  Thu, 22 Oct 2026 08:39:38 +0200
 


=====================================
debian/control
=====================================
@@ -7,7 +7,6 @@ Section: science
 Build-Depends:
  debhelper-compat (= 14),
  architecture-is-64-bit,
- dh-exec,
  libargparse-dev,
  libcpptoml-dev,
  libsdsl-dev,
@@ -23,12 +22,11 @@ Architecture: any
 Section: libdevel
 Depends:
  libcpptoml-dev,
+ libsdsl-dev,
  samtools,
  wget,
  ${misc:Depends},
  ${shlibs:Depends},
-Recommends:
- libsdsl-dev,
 Description: Bioinformatics Technology Lab common code library
  Bioinformatics Technology Lab common code library in C++ with
  Python wrappers.


=====================================
debian/libbtllib-dev.install
=====================================
@@ -1,3 +1,2 @@
-#! /usr/bin/dh-exec
 usr/lib/*.a	usr/lib/${DEB_HOST_MULTIARCH}
 usr/include


=====================================
debian/patches/find_object_files_at_right_loc.patch
=====================================
@@ -1,20 +1,21 @@
 Author: Nilesh Patra
-Last-Update: 2022-09-30
+Last-Update: 2026-10-22
 Description: Avoid useless cmake checks and trust the known locations in Debian
 Forwarded: not-needed
+Assisted-By: opencode/deepseek-v4.1-flash-free
 
---- btllib.orig/meson.build
-+++ btllib/meson.build
+--- a/meson.build
++++ b/meson.build
 @@ -1,7 +1,7 @@
  project('btllib', 'cpp',
-         version : '1.7.5',
+         version : '1.8.0',
          license : 'GPL3',
 -        default_options : [ 'cpp_std=c++17', 'warning_level=3', 'werror=true', 'b_coverage=true' ],
 +        default_options : [ 'cpp_std=c++17', 'warning_level=3', 'werror=false', 'b_coverage=false' ],
          meson_version : '>= 0.60.0')
  
  # Configuration
-@@ -47,25 +47,13 @@
+@@ -47,30 +47,13 @@ add_global_link_arguments(global_link_ar
  threads_dep = dependency('threads')
  openmp_dep = dependency('openmp', required : false)
  
@@ -22,6 +23,11 @@ Forwarded: not-needed
 -cmake_options.set_override_option('werror', 'false')
 -cmake_options.set_install(false)
 -
+-if host_machine.cpu_family() == 'aarch64'
+-  cmake_options.add_cmake_defines({'ENABLE_LIBCXX': false})
+-  cmake_options.add_cmake_defines({'CPPTOML_BUILD_EXAMPLES': false})
+-endif
+-
 -cpptoml_subproject = cmake.subproject('cpptoml', options : cmake_options)
 -cpptomp_dep = cpptoml_subproject.dependency('cpptoml')
 -


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -1,11 +1,12 @@
 Author: Andreas Tille <tille at debian.org>
-Last-Update: 2022-10-05
+Last-Update: 2026-10-22
 Description: There is nothing to copy if libcpptoml-dev package is used
 Forwarded: not-needed
+Assisted-By: opencode/deepseek-v4.1-flash-free
 
 --- a/scripts/install-cpptoml
 +++ b/scripts/install-cpptoml
-@@ -12,4 +12,4 @@
+@@ -12,4 +12,4 @@ DESTDIR="${DESTDIR:-}"
  
  mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
  
@@ -13,7 +14,7 @@ Forwarded: not-needed
 +#cp "${MESON_SOURCE_ROOT}/subprojects/cpptoml/include/cpptoml.h" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
 --- a/scripts/install-sdsl-lite
 +++ b/scripts/install-sdsl-lite
-@@ -12,4 +12,4 @@
+@@ -12,4 +12,4 @@ DESTDIR="${DESTDIR:-}"
  
  mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
  
@@ -21,7 +22,7 @@ Forwarded: not-needed
 +#cp -r "${MESON_SOURCE_ROOT}/subprojects/sdsl-lite/include/sdsl" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
 --- a/meson.build
 +++ b/meson.build
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ if compiler_id == 'clang' and compiler_v
  endif
  
  global_args = []
@@ -30,7 +31,7 @@ Forwarded: not-needed
  
  if compiler_id == 'clang'
    global_link_args += [ '-lstdc++', '-lm' ]
-@@ -53,8 +53,8 @@
+@@ -53,8 +53,8 @@ deps = [ threads_dep, openmp_dep ]
  meson.add_install_script('scripts/install-cpptoml')
  meson.add_install_script('scripts/install-sdsl-lite')
  
@@ -43,12 +44,12 @@ Forwarded: not-needed
  # ===========================================================
 --- a/recipes/meson.build
 +++ b/recipes/meson.build
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ executable('indexlr',
  executable('randseq',
              meson.project_source_root() + '/recipes/randseq.cpp',
              include_directories : btllib_include,
 -            dependencies : deps + [ btllib_dep, argparse_dep ],
 +            dependencies : deps + [ btllib_dep ],
              install : true,
-             install_dir : 'bin',
-             override_options : ['cpp_std=c++17'])
+             install_dir : 'bin')
+ 



View it on GitLab: https://salsa.debian.org/med-team/btllib/-/compare/97b3de16e6afc4128ff5993c7839f072e81f04cf...df1430059523064ca4ad4f23998647a210f0c3f0

-- 
View it on GitLab: https://salsa.debian.org/med-team/btllib/-/compare/97b3de16e6afc4128ff5993c7839f072e81f04cf...df1430059523064ca4ad4f23998647a210f0c3f0
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/20261022/faeb9c14/attachment-0001.htm>

More information about the debian-med-commit mailing list