[med-svn] [Git][med-team/libvcflib][master] 10 commits: Drop obsolete tabix_linking and wfa2_linking patches
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Oct 28 08:27:16 GMT 2026
Andreas Tille pushed to branch master at Debian Med / libvcflib
Commits:
43badece by Andreas Tille at 2026-10-22T17:11:09+02:00
Drop obsolete tabix_linking and wfa2_linking patches
The 1.0.15 CMake files handle tabixpp and wfa2 detection themselves, so the Debian-specific linking patches are no longer needed.
- - - - -
1e61f398 by Andreas Tille at 2026-10-22T17:17:29+02:00
Refresh patches for 1.0.15+dfsg
Use the libsmithwaterman and libfastahack pkg-config modules, keep SOVERSION 2 now that upstream builds a shared library by default, and fall back to find_path()/find_library() for tabixpp because Debian's libtabixpp-dev has no pkg-config file.
- - - - -
ebd819b5 by Andreas Tille at 2026-10-22T17:17:33+02:00
Adapt libssw patch to the libssw1 API
libssw 1.2.5 added the mask length argument to Aligner::Align() and renamed ssw_cpp.hpp to ssw_cpp.h.
- - - - -
154a0745 by Andreas Tille at 2026-10-22T17:17:42+02:00
Add liblzma-dev and zlib1g-dev build dependencies
The 1.0.15 build system calls find_package(LibLZMA) and find_package(ZLIB).
- - - - -
42ce2e17 by Andreas Tille at 2026-10-22T17:17:51+02:00
Fix installation paths and skip upstream vcflib.pc
Upstream now installs manual pages under usr/share/man. Its vcflib.pc requires pkg-config modules that do not exist in Debian (libwfa2, tabixpp) and uses the wrong names for smithwaterman and fastahack, so do not ship it; Debian installs the corrected libvcflib.pc instead.
- - - - -
4c324030 by Andreas Tille at 2026-10-22T17:18:04+02:00
Update changelog for 1.0.15+dfsg
- - - - -
e895656e by Andreas Tille at 2026-10-22T17:18:49+02:00
Remove unused patch
- - - - -
5d519a2c by Andreas Tille at 2026-10-22T17:19:27+02:00
Cleanup patches
- - - - -
8288c73e by Andreas Tille at 2026-10-28T09:21:30+01:00
libvcflib-tools: Move the R dependencies (r-base-core, r-cran-ggplot2, r-cran-plyr, r-cran-pracma) from Depends to Recommends. The core VCF manipulation tools do not need R; only the auxiliary R plotting scripts do. Drop r-cran-gridbase, which is not used by any shipped script.
- - - - -
9eb4e8d9 by Andreas Tille at 2026-10-28T09:26:05+01:00
Upload to unstable
- - - - -
14 changed files:
- debian/changelog
- debian/control
- debian/libvcflib-tools.manpages
- debian/patches/cmakelists-fixups.patch
- debian/patches/no_fsom
- debian/patches/series
- debian/patches/shared_lib.patch
- − debian/patches/tabix_linking
- − debian/patches/tests
- debian/patches/use_debian_packaged_fastahack.patch
- debian/patches/use_debian_packaged_libssw.patch
- debian/patches/use_debian_packaged_smithwaterman.patch
- − debian/patches/wfa2_linking
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,13 +1,28 @@
-libvcflib (1.0.15+dfsg-1) UNRELEASED; urgency=medium
+libvcflib (1.0.15+dfsg-1) unstable; urgency=medium
* d/watch: version=5
- * New upstream version
+ * New upstream version 1.0.15+dfsg
+ * Refresh patches for the 1.0.15 CMake changes:
+ - use the libsmithwaterman and libfastahack pkg-config modules
+ - adapt the libssw Align() call to the libssw1 API
+ - keep SOVERSION 2 for the shared library
+ - fall back to find_path()/find_library() for tabixpp, which has no
+ pkg-config file in Debian
+ * Drop the obsolete tabix_linking and wfa2_linking patches.
+ * Add liblzma-dev and zlib1g-dev to Build-Depends.
+ * Install manual pages from usr/share/man.
+ * Do not ship the upstream vcflib.pc, which requires pkg-config modules
+ that are not available in Debian.
* Standards-Version: 4.7.4 (routine-update)
* Reflow Uploaders field (cme)
* Reformat the Last-Update date as ISO YYYY-MM-DD.
* debputy lint --auto-fix (routine-update)
+ * libvcflib-tools: Move the R dependencies (r-base-core, r-cran-ggplot2,
+ r-cran-plyr, r-cran-pracma) from Depends to Recommends. The core VCF
+ manipulation tools do not need R; only the auxiliary R plotting scripts
+ do. Drop r-cran-gridbase, which is not used by any shipped script.
- -- Andreas Tille <tille at debian.org> Thu, 22 Oct 2026 16:01:22 +0200
+ -- Andreas Tille <tille at debian.org> Wed, 28 Oct 2026 09:21:36 +0100
libvcflib (1.0.12+dfsg-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -16,6 +16,7 @@ Build-Depends:
libfastahack-dev,
libgtest-dev <!nocheck>,
libhts-dev,
+ liblzma-dev,
libsmithwaterman-dev,
libssw-dev,
libtabixpp-dev,
@@ -23,6 +24,7 @@ Build-Depends:
pkgconf,
python3-dev,
python3-pybind11,
+ zlib1g-dev,
Vcs-Browser: https://salsa.debian.org/med-team/libvcflib
Vcs-Git: https://salsa.debian.org/med-team/libvcflib.git
Homepage: https://github.com/vcflib/vcflib
@@ -83,13 +85,12 @@ Package: libvcflib-tools
Architecture: any
Depends:
python3:any,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
r-base-core,
r-cran-ggplot2,
- r-cran-gridbase,
r-cran-plyr,
- ${misc:Depends},
- ${shlibs:Depends},
-Suggests:
r-cran-pracma,
Description: C++ library for parsing and manipulating VCF files (tools)
The Variant Call Format (VCF) is a flat-file, tab-delimited textual format
=====================================
debian/libvcflib-tools.manpages
=====================================
@@ -1 +1 @@
-usr/man/man1/*.1
+usr/share/man/man1/*.1
=====================================
debian/patches/cmakelists-fixups.patch
=====================================
@@ -1,31 +1,45 @@
-Description: fix a couple of issues caught while working on 1.0.11~pre2.
- There is one case of install() statement having something unexpected in its
- target, and removing the entry does not seem to cause anything obvious to be
- lost. The other issue resolved is the proper capture of the tabix header in
- /usr/include, which has a slightly different name from the embedded copy.
+Description: use the system tabixpp when no pkg-config file is available
+ Debian's libtabixpp-dev does not ship a pkg-config file, so fall back to
+ find_path() and find_library() instead of the vendored copy that is not
+ present in the DFSG tarball.
Author: Étienne Mollier <emollier at debian.org>
+Assisted-By: deepseek-v4.1-flash-free
Forwarded: no
-Last-Update: 2024-05-04
+Last-Update: 2026-10-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- libvcflib.orig/CMakeLists.txt
-+++ libvcflib/CMakeLists.txt
-@@ -134,7 +134,7 @@
- set(TABIXPP_LOCAL contrib/tabixpp)
- include_directories(contrib/tabixpp)
- set(tabixpp_SOURCE
-- contrib/tabixpp/tabix.cpp
-+ /usr/include/tabix.hpp
- )
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,12 +127,13 @@ if(NOT htslib_FOUND)
endif()
-@@ -597,7 +597,7 @@
- # ---- Install
+ if(NOT tabixpp_FOUND)
+- message(STATUS "Using included tabixpp")
+- set(tabixpp_LOCAL contrib/tabixpp)
+- include_directories(contrib/tabixpp)
+- set(tabixpp_SOURCE
+- contrib/tabixpp/tabix.cpp
+- )
++ message(STATUS "Using system tabixpp")
++ find_path(TABIXPP_INCLUDE_DIR tabix.hpp)
++ find_library(TABIXPP_LIBRARY tabixpp)
++ if(NOT TABIXPP_INCLUDE_DIR OR NOT TABIXPP_LIBRARY)
++ message(FATAL_ERROR "tabixpp not found")
++ endif()
++ include_directories(${TABIXPP_INCLUDE_DIR})
+ endif()
- install(TARGETS vcflib ARCHIVE DESTINATION ${CMAKE_INSTALL_BINDIR})
--install(TARGETS ${WFALIB} ARCHIVE DESTINATION ${CMAKE_INSTALL_BINDIR})
-+#install(TARGETS ${WFALIB} ARCHIVE DESTINATION ${CMAKE_INSTALL_BINDIR})
+ if(WFA_GITMODULE)
+@@ -429,8 +430,10 @@ list(APPEND vcflib_LIBS
+ ${htslib_dependencies} # linking htslib for everything is not needed if we have our own bgzip reader
+ )
- install(FILES ${INCLUDES} DESTINATION include/vcflib)
+-if (NOT tabixpp_LOCAL)
++if (tabixpp_FOUND)
+ target_link_libraries(vcflib PkgConfig::tabixpp)
++else()
++ target_link_libraries(vcflib ${TABIXPP_LIBRARY})
+ endif()
+ target_link_libraries(vcflib PkgConfig::smithwaterman)
=====================================
debian/patches/no_fsom
=====================================
@@ -1,9 +1,9 @@
From: Michael R. Crusoe <crusoe at debian.org>
Subject: fsom is not used
Forwarded: not-needed
---- libvcflib.orig/CMakeLists.txt
-+++ libvcflib/CMakeLists.txt
-@@ -177,7 +177,6 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -176,7 +176,6 @@ set(vcflib_SOURCE
contrib/smithwaterman/IndelAllele.cpp
contrib/smithwaterman/disorder.cpp
contrib/smithwaterman/LeftAlign.cpp
=====================================
debian/patches/series
=====================================
@@ -4,7 +4,4 @@ use_debian_packaged_fastahack.patch
use_debian_packaged_libssw.patch
shared_lib.patch
pkg-config.patch
-tabix_linking
-#tests ## FIXME: deactivated for the moment
-wfa2_linking
cmakelists-fixups.patch
=====================================
debian/patches/shared_lib.patch
=====================================
@@ -1,44 +1,17 @@
Author: Andreas Tille <tille at debian.org>
-Last-Update: 2016-09-15
-Description: Create shared lib instead of static
+Last-Update: 2026-10-22
+Description: Set the shared library SOVERSION to 2
Forwarded: not-needed
+Assisted-By: deepseek-v4.1-flash-free
---- libvcflib.orig/CMakeLists.txt
-+++ libvcflib/CMakeLists.txt
-@@ -173,19 +173,19 @@
- contrib/c-progress-bar/progress.c
- )
-
--target_link_libraries(vcflib
-- PkgConfig::SMITHWATERMAN
-- PkgConfig::FASTAHACK
-- )
--
- if (TABIXPP_LOCAL) # add the tabixpp source file
- list(APPEND vcflib_SOURCE ${tabixpp_SOURCE})
- endif()
-
--add_library(vcflib STATIC
-+add_library(vcflib SHARED
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,6 +181,8 @@ add_library(vcflib
${vcflib_SOURCE}
)
-+target_link_libraries(vcflib
-+ PkgConfig::SMITHWATERMAN
-+ PkgConfig::FASTAHACK
-+ )
++set_target_properties(vcflib PROPERTIES SOVERSION 2)
+
set(BINS
vcfecho
dumpContigsFromHeader
-@@ -322,6 +322,10 @@
- file (STRINGS "VERSION" BUILD_NUMBER)
- add_definitions(-DVCFLIB_VERSION="${BUILD_NUMBER}")
- add_definitions(-DVERSION="${BUILD_NUMBER}")
-+string(REGEX MATCH "^[0-9]+" MAJOR_BUILD_NUMBER ${BUILD_NUMBER})
-+set_target_properties(vcflib PROPERTIES
-+ SOVERSION 2
-+ )
-
- # ---- Build htslib
- #
=====================================
debian/patches/tabix_linking deleted
=====================================
@@ -1,13 +0,0 @@
-Author: Michael R. Crusoe <crusoe at debian.org>
-Description: link against tabixpp
-Forwarded: not-needed
---- libvcflib.orig/CMakeLists.txt
-+++ libvcflib/CMakeLists.txt
-@@ -184,6 +184,7 @@
- target_link_libraries(vcflib
- PkgConfig::SMITHWATERMAN
- PkgConfig::FASTAHACK
-+ tabixpp
- )
-
- set(BINS
=====================================
debian/patches/tests deleted
=====================================
@@ -1,32 +0,0 @@
-Author: Michael R. Crusoe <crusoe at debian.org>
-Description: Use packaged gtest and update paths
-Forwarded: not-needed
---- libvcflib.orig/test/Makefile
-+++ libvcflib/test/Makefile
-@@ -7,22 +7,17 @@
- CXX=g++
- CFLAGS=-Wall -std=c++0x
- INCLUDE=-I../src -I../googletest/googletest/include/ -I../fastahack -I../smithwaterman/ -I../multichoose/ -I../filevercmp/ -I../googletest/googletest/make/
--LIB=-L../build -L../googletest/googletest/make/ -lm -ltabixpp -lhts -lpthread
--LIBGTEST=../googletest/googletest/make/gtest_main.a
--LIBVCF=../build/libvcflib.a
-+LIB=-L../obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)/ -L../googletest/googletest/make/ -lm -ltabixpp -lhts -lpthread
-+LIBGTEST=-lgtest_main -lgtest
-+LIBVCF=-lvcflib
-
- all: run
-
--../googletest/googletest/make/gtest_main.a:
-- cd ../googletest/googletest/make && make
--
--tests/main: ../googletest/googletest/make/gtest_main.a
-+tests/main:
- $(CXX) $(CFLAGS) $(INCLUDE) tests/mainTest.cpp -o tests/main $(LIBVCF) $(LIBGTEST) $(LIB)
-
- run: tests/main
- ./tests/main
-- rm -v ../googletest/googletest/make/gtest_main.a
-- rm -v ../googletest/googletest/make/sample1_unittest
-
- clean:
- rm -f tests/main
=====================================
debian/patches/use_debian_packaged_fastahack.patch
=====================================
@@ -1,34 +1,35 @@
Author: Andreas Tille <tille at debian.org>
-Last-Update: 2021-01-28
+Last-Update: 2026-10-22
Description: Use Debian packaged libfastahack (and libdisorder)
Forwarded: not-needed
---- libvcflib.orig/CMakeLists.txt
-+++ libvcflib/CMakeLists.txt
-@@ -60,6 +60,7 @@
- pkg_check_modules(HTSLIB htslib) # Optionally builds from contrib/
- pkg_check_modules(TABIXPP tabixpp) # Optionally builds from contrib/
- pkg_check_modules(SMITHWATERMAN REQUIRED IMPORTED_TARGET libsmithwaterman)
-+pkg_check_modules(FASTAHACK REQUIRED IMPORTED_TARGET libfastahack)
+Assisted-By: deepseek-v4.1-flash-free
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,6 +66,7 @@ set_package_properties(Threads PROPERTIE
+ pkg_check_modules(htslib IMPORTED_TARGET htslib) # Optionally builds from contrib/
+ pkg_check_modules(tabixpp IMPORTED_TARGET tabixpp) # Optionally builds from contrib/
+ pkg_check_modules(smithwaterman REQUIRED IMPORTED_TARGET libsmithwaterman)
++pkg_check_modules(fastahack REQUIRED IMPORTED_TARGET libfastahack)
# ---- Build switches
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-@@ -109,7 +110,6 @@
+ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${ipo_supported})
+@@ -114,7 +115,6 @@ endif(ZIG)
# ---- Include files
include_directories(include)
-include_directories(contrib/fastahack)
include_directories(contrib/intervaltree)
- # include_directories(contrib/multichoose) merged with vcflib
include_directories(contrib/filevercmp)
-@@ -146,7 +146,6 @@
+ include_directories(contrib/c-progress-bar)
+@@ -142,7 +142,6 @@ endif()
+ file(GLOB INCLUDES
src/*.h*
- # contrib/multichoose/*.h*
contrib/intervaltree/*.h*
- contrib/fastahack/*.h*
contrib/filevercmp/*.h*
)
-@@ -170,13 +169,13 @@
+@@ -169,7 +168,6 @@ set(vcflib_SOURCE
src/LeftAlign.cpp
src/cigar.cpp
src/allele.cpp
@@ -36,92 +37,93 @@ Forwarded: not-needed
contrib/filevercmp/filevercmp.c
contrib/c-progress-bar/progress.c
)
+@@ -434,6 +432,7 @@ if (NOT tabixpp_LOCAL)
+ endif()
- target_link_libraries(vcflib
- PkgConfig::SMITHWATERMAN
-+ PkgConfig::FASTAHACK
- )
+ target_link_libraries(vcflib PkgConfig::smithwaterman)
++target_link_libraries(vcflib PkgConfig::fastahack)
- if (TABIXPP_LOCAL) # add the tabixpp source file
---- libvcflib.orig/src/vcf2dag.cpp
-+++ libvcflib/src/vcf2dag.cpp
-@@ -11,7 +11,7 @@
+ if(OPENMP)
+ target_link_libraries(vcflib OpenMP::OpenMP_CXX)
+--- a/src/vcf2dag.cpp
++++ b/src/vcf2dag.cpp
+@@ -13,7 +13,7 @@
#include "BedReader.h"
- #include "IntervalTree.h"
+
#include <getopt.h>
--#include "Fasta.h"
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
- #include <algorithm>
- #include <list>
- #include <set>
---- libvcflib.orig/src/vcf2fasta.cpp
-+++ libvcflib/src/vcf2fasta.cpp
-@@ -13,7 +13,7 @@
- #include "split.h"
- #include <set>
+
+ using namespace std;
+ using namespace vcflib;
+--- a/src/vcf2fasta.cpp
++++ b/src/vcf2fasta.cpp
+@@ -11,7 +11,7 @@
+ #include "convert.h"
+
#include <getopt.h>
--#include "Fasta.h"
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
#include <iostream>
#include <fstream>
---- libvcflib.orig/src/vcfcheck.cpp
-+++ libvcflib/src/vcfcheck.cpp
-@@ -10,7 +10,7 @@
+--- a/src/vcfcheck.cpp
++++ b/src/vcfcheck.cpp
+@@ -9,7 +9,7 @@
+ */
#include "Variant.h"
- #include "split.h"
-#include "Fasta.h"
+#include <fastahack/Fasta.h>
#include "gpatInfo.hpp"
#include <getopt.h>
- #include <string.h>
---- libvcflib.orig/src/vcfentropy.cpp
-+++ libvcflib/src/vcfentropy.cpp
-@@ -9,7 +9,7 @@
+ #include <cstring>
+--- a/src/vcfentropy.cpp
++++ b/src/vcfentropy.cpp
+@@ -10,7 +10,7 @@
+ #include "convert.h"
#include "Variant.h"
- #include "split.h"
--#include "Fasta.h"
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
#include <getopt.h>
- #include "disorder.h"
+ #include <disorder.h>
---- libvcflib.orig/src/vcfevenregions.cpp
-+++ libvcflib/src/vcfevenregions.cpp
+--- a/src/vcfevenregions.cpp
++++ b/src/vcfevenregions.cpp
@@ -9,7 +9,7 @@
#include "Variant.h"
- #include "split.h"
--#include "Fasta.h"
+
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
#include <getopt.h>
#include <cmath>
---- libvcflib.orig/src/vcfgeno2haplo.cpp
-+++ libvcflib/src/vcfgeno2haplo.cpp
-@@ -9,7 +9,7 @@
+--- a/src/vcfgeno2haplo.cpp
++++ b/src/vcfgeno2haplo.cpp
+@@ -13,7 +13,7 @@
+ #include "join.h"
- #include "Variant.h"
#include <getopt.h>
--#include "Fasta.h"
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
- #include "gpatInfo.hpp"
- #include <algorithm>
#include <list>
---- libvcflib.orig/src/vcfinfosummarize.cpp
-+++ libvcflib/src/vcfinfosummarize.cpp
+ #include <set>
+
+--- a/src/vcfinfosummarize.cpp
++++ b/src/vcfinfosummarize.cpp
@@ -9,7 +9,7 @@
#include "Variant.h"
- #include "split.h"
+ #include "stats.hpp"
-#include "Fasta.h"
+#include <fastahack/Fasta.h>
#include "gpatInfo.hpp"
#include <getopt.h>
#include <algorithm>
---- libvcflib.orig/src/vcfintersect.cpp
-+++ libvcflib/src/vcfintersect.cpp
+--- a/src/vcfintersect.cpp
++++ b/src/vcfintersect.cpp
@@ -11,7 +11,7 @@
#include "BedReader.h"
#include "IntervalTree.h"
@@ -129,21 +131,21 @@ Forwarded: not-needed
-#include "Fasta.h"
+#include <fastahack/Fasta.h>
#include <algorithm>
+ #include "convert.h"
#include <list>
- #include <set>
---- libvcflib.orig/src/vcfleftalign.cpp
-+++ libvcflib/src/vcfleftalign.cpp
+--- a/src/vcfleftalign.cpp
++++ b/src/vcfleftalign.cpp
@@ -11,7 +11,7 @@
- #include "convert.h"
#include "join.h"
- #include "split.h"
--#include "Fasta.h"
+ #include "LeftAlign.hpp"
+
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
- #include <set>
#include <vector>
#include <getopt.h>
---- libvcflib.orig/src/vcfnormalizesvs.cpp
-+++ libvcflib/src/vcfnormalizesvs.cpp
+ #include <cmath>
+--- a/src/vcfnormalizesvs.cpp
++++ b/src/vcfnormalizesvs.cpp
@@ -9,7 +9,7 @@
#include "Variant.h"
@@ -153,30 +155,30 @@ Forwarded: not-needed
using namespace std;
using namespace vcflib;
---- libvcflib.orig/src/vcfprimers.cpp
-+++ libvcflib/src/vcfprimers.cpp
+--- a/src/vcfprimers.cpp
++++ b/src/vcfprimers.cpp
@@ -9,7 +9,7 @@
#include "Variant.h"
- #include "split.h"
--#include "Fasta.h"
+
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
#include <getopt.h>
+ #include <iostream>
+
+--- a/src/vcfremap.cpp
++++ b/src/vcfremap.cpp
+@@ -13,7 +13,7 @@
+ #include "join.h"
- using namespace std;
---- libvcflib.orig/src/vcfremap.cpp
-+++ libvcflib/src/vcfremap.cpp
-@@ -11,7 +11,7 @@
- #include "BedReader.h"
- #include "IntervalTree.h"
#include <getopt.h>
--#include "Fasta.h"
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
- #include <algorithm>
#include <list>
- #include <set>
---- libvcflib.orig/src/vcfroc.cpp
-+++ libvcflib/src/vcfroc.cpp
+ #include <SmithWatermanGotoh.h>
+
+--- a/src/vcfroc.cpp
++++ b/src/vcfroc.cpp
@@ -12,7 +12,7 @@
#include "BedReader.h"
#include "IntervalTree.h"
@@ -186,14 +188,25 @@ Forwarded: not-needed
#include <algorithm>
#include <list>
#include <set>
---- libvcflib.orig/src/vcfsample2info.cpp
-+++ libvcflib/src/vcfsample2info.cpp
-@@ -9,7 +9,7 @@
+--- a/src/vcfsample2info.cpp
++++ b/src/vcfsample2info.cpp
+@@ -11,7 +11,7 @@
+ #include "stats.hpp"
+ #include "convert.h"
- #include "Variant.h"
- #include "split.h"
--#include "Fasta.h"
+-#include <Fasta.h>
+#include <fastahack/Fasta.h>
#include <getopt.h>
#include <algorithm>
#include <numeric>
+--- a/src/Variant.h
++++ b/src/Variant.h
+@@ -30,7 +30,7 @@
+ #include <memory>
+ #include <functional>
+ #include <tabix.hpp>
+-#include <Fasta.h>
++#include <fastahack/Fasta.h>
+
+ #include "allele.hpp"
+
=====================================
debian/patches/use_debian_packaged_libssw.patch
=====================================
@@ -1,9 +1,10 @@
Author: Andreas Tille <tille at debian.org>
-Last-Update: 2021-01-28
+Last-Update: 2026-10-22
Bug-Debian: https://bugs.debian.org/838513
Description: Use Debian packaged libssw (while its not clear
why two implementations of Smith-Waterman are needed at all)
Forwarded: not-needed
+Assisted-By: deepseek-v4.1-flash-free
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -12,7 +12,7 @@
@@ -14,4 +15,14 @@ Forwarded: not-needed
+#include <ssw_cpp.h>
#include <regex>
- namespace vcflib {
+ #include "join.h"
+@@ -2790,7 +2790,8 @@ map<string, vector<VariantAllele> > Vari
+ StripedSmithWaterman::Alignment alignment;
+ aligner.Align(alternateQuery_M.c_str(),
+ reference_M.c_str(),
+- reference_M.size(), sswFilter, &alignment);
++ reference_M.size(), sswFilter, &alignment,
++ static_cast<int32_t>(alternateQuery_M.size() / 2));
+ cigar = alignment.cigar_string;
+ }
+
=====================================
debian/patches/use_debian_packaged_smithwaterman.patch
=====================================
@@ -1,34 +1,35 @@
Author: Andreas Tille <tille at debian.org>
-Last-Update: 2021-01-28
+Last-Update: 2026-10-22
Description: Use Debian packaged libsmithwaterman
Forwarded: not-needed
---- libvcflib.orig/CMakeLists.txt
-+++ libvcflib/CMakeLists.txt
-@@ -59,6 +59,7 @@
+Assisted-By: deepseek-v4.1-flash-free
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,6 +65,7 @@ set_package_properties(Threads PROPERTIE
- pkg_check_modules(HTSLIB htslib) # Optionally builds from contrib/
- pkg_check_modules(TABIXPP tabixpp) # Optionally builds from contrib/
-+pkg_check_modules(SMITHWATERMAN REQUIRED IMPORTED_TARGET libsmithwaterman)
+ pkg_check_modules(htslib IMPORTED_TARGET htslib) # Optionally builds from contrib/
+ pkg_check_modules(tabixpp IMPORTED_TARGET tabixpp) # Optionally builds from contrib/
++pkg_check_modules(smithwaterman REQUIRED IMPORTED_TARGET libsmithwaterman)
# ---- Build switches
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-@@ -110,7 +111,6 @@
+ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${ipo_supported})
+@@ -115,7 +116,6 @@ endif(ZIG)
include_directories(include)
include_directories(contrib/fastahack)
include_directories(contrib/intervaltree)
-include_directories(contrib/smithwaterman)
- # include_directories(contrib/multichoose) merged with vcflib
include_directories(contrib/filevercmp)
include_directories(contrib/c-progress-bar)
-@@ -146,7 +146,6 @@
+
+@@ -142,7 +142,6 @@ endif()
+ file(GLOB INCLUDES
src/*.h*
- # contrib/multichoose/*.h*
contrib/intervaltree/*.h*
- contrib/smithwaterman/*.h*
contrib/fastahack/*.h*
contrib/filevercmp/*.h*
)
-@@ -172,15 +171,14 @@
+@@ -171,11 +170,6 @@ set(vcflib_SOURCE
src/cigar.cpp
src/allele.cpp
contrib/fastahack/Fasta.cpp
@@ -40,11 +41,12 @@ Forwarded: not-needed
contrib/filevercmp/filevercmp.c
contrib/c-progress-bar/progress.c
)
+@@ -439,6 +433,8 @@ if (NOT tabixpp_LOCAL)
+ target_link_libraries(vcflib PkgConfig::tabixpp)
+ endif()
-+target_link_libraries(vcflib
-+ PkgConfig::SMITHWATERMAN
-+ )
++target_link_libraries(vcflib PkgConfig::smithwaterman)
+
- if (TABIXPP_LOCAL) # add the tabixpp source file
- list(APPEND vcflib_SOURCE ${tabixpp_SOURCE})
+ if(OPENMP)
+ target_link_libraries(vcflib OpenMP::OpenMP_CXX)
endif()
=====================================
debian/patches/wfa2_linking deleted
=====================================
@@ -1,17 +0,0 @@
-Description: set -lwfa2 for the linker
- This works around a failure to catch the wfa2 library by the CMake files.
-Author: Étienne Mollier <emollier at debian.org>
-Forwarded: no
-Last-Update: 2023-02-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- libvcflib.orig/CMakeLists.txt
-+++ libvcflib/CMakeLists.txt
-@@ -185,6 +185,7 @@
- PkgConfig::SMITHWATERMAN
- PkgConfig::FASTAHACK
- tabixpp
-+ wfa2
- )
-
- set(BINS
=====================================
debian/rules
=====================================
@@ -39,6 +39,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
endif
override_dh_install:
+ rm -f debian/tmp/usr/lib/*/pkgconfig/vcflib.pc
dh_install
find debian/lib* -name filevercmp.h -delete
cp -a debian/ext/filevercmp/filevercmp.h debian/libvcflib-dev/usr/include/vcflib/
@@ -66,7 +67,7 @@ override_dh_install:
# --movedev libvcflib.pc usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
# debian/tmp/usr/lib/*/*.so
# find debian -name "lib*.la" -delete
- for pl in `grep -Rl '#!/usr/bin/env' debian/*/usr/*` ; do \
+ for pl in `grep -Rl --binary-files=without-match '#!/usr/bin/env' debian/*/usr/* 2>/dev/null` ; do \
sed -i '1s?^#!/usr/bin/env[[:space:]]\+perl?#!/usr/bin/perl?' $${pl} ; \
done
View it on GitLab: https://salsa.debian.org/med-team/libvcflib/-/compare/6bbbfb777b0f03b7da6546ab77bc08f2b1e45332...9eb4e8d91751ebbeb750dd6295c9eb2596a41ae9
--
View it on GitLab: https://salsa.debian.org/med-team/libvcflib/-/compare/6bbbfb777b0f03b7da6546ab77bc08f2b1e45332...9eb4e8d91751ebbeb750dd6295c9eb2596a41ae9
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/20261028/b325593b/attachment-0001.htm>
More information about the debian-med-commit
mailing list