[med-svn] [Git][med-team/quicktree][master] 3 commits: Add new binary package libquicktree2
Andreas Tille (@tille)
gitlab at salsa.debian.org
Fri Nov 6 07:02:48 GMT 2026
Andreas Tille pushed to branch master at Debian Med / quicktree
Commits:
2fb7f854 by Andreas Tille at 2026-11-06T08:00:33+01:00
Add new binary package libquicktree2
- - - - -
7927ecc1 by Andreas Tille at 2026-11-06T08:00:38+01:00
Test shared lib
- - - - -
7c4b8a9c by Andreas Tille at 2026-11-06T08:02:22+01:00
Add symbols file
- - - - -
10 changed files:
- debian/changelog
- + debian/clean
- debian/control
- − debian/libquicktree-dev.install
- + debian/libquicktree2.symbols
- + debian/patches/build_shared_library.patch
- debian/patches/series
- debian/rules
- debian/tests/control
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+quicktree (2.5-7) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Add new binary package libquicktree2
+
+ -- Andreas Tille <tille at debian.org> Fri, 06 Nov 2026 07:46:48 +0100
+
quicktree (2.5-6) unstable; urgency=medium
* Team upload.
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+libquicktree.so*
=====================================
debian/control
=====================================
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Steffen Moeller <moeller at debian.org>
Build-Depends: debhelper-compat (= 13),
- help2man,
- dh-exec
-Standards-Version: 4.6.2
+ d-shlibs,
+ help2man
+Standards-Version: 4.5.0
Homepage: https://github.com/khowe/quicktree/
Vcs-Browser: https://salsa.debian.org/med-team/quicktree
Vcs-Git: https://salsa.debian.org/med-team/quicktree.git
@@ -31,10 +31,24 @@ Description: Neighbor-Joining algorithm for phylogenies
The tress are written to stdout, in the Newick/New-Hampshire format
use by PHYLIP and many other programs
+Package: libquicktree2
+Architecture: any
+Section: libs
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: Neighbor-Joining algorithm for phylogenies (shared library)
+ QuickTree is an efficient implementation of the Neighbor-Joining
+ algorithm (PMID: 3447015), capable of reconstructing phylogenies from
+ huge alignments in time less than the age of the universe.
+ .
+ This package contains the shared library libquicktree.so.2.
+
Package: libquicktree-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends},
+Multi-Arch: same
+Depends: libquicktree2 (= ${binary:Version}),
${misc:Depends}
Description: Neighbor-Joining algorithm for phylogenies (development)
QuickTree is an efficient implementation of the Neighbor-Joining
@@ -51,5 +65,6 @@ Description: Neighbor-Joining algorithm for phylogenies (development)
The tress are written to stdout, in the Newick/New-Hampshire format
use by PHYLIP and many other programs
.
- This package contains some header files from quicktree that are used
- by other packages.
+ This package contains the header files and the static library from
+ quicktree that are used by other packages, as well as the libquicktree.so
+ linker symlink.
=====================================
debian/libquicktree-dev.install deleted
=====================================
@@ -1,4 +0,0 @@
-#!/usr/bin/dh-exec
-
-include/*.h usr/include/quicktree
-lib*.a usr/lib/${DEB_HOST_MULTIARCH}
=====================================
debian/libquicktree2.symbols
=====================================
@@ -0,0 +1,58 @@
+libquicktree.so.2 libquicktree2 #MINVER#
+ UPGMA_buildtree at Base 2.5-7
+ alignment_to_ClusterGroup at Base 2.5-7
+ assign_nodenumbers_Tnode at Base 2.5-7
+ calc_DistanceMatrix at Base 2.5-7
+ calloc_util at Base 2.5-7
+ clone_Cluster at Base 2.5-7
+ clone_DistanceMatrix at Base 2.5-7
+ clone_Sequence at Base 2.5-7
+ clone_Tnode at Base 2.5-7
+ clone_Tree at Base 2.5-7
+ compare_to_bootstrap_sample_Tnode at Base 2.5-7
+ consensus_aln_from_ClusterGroup at Base 2.5-7
+ empty_Cluster at Base 2.5-7
+ empty_ClusterGroup at Base 2.5-7
+ empty_DistanceMatrix at Base 2.5-7
+ empty_Sequence at Base 2.5-7
+ empty_Tree at Base 2.5-7
+ export_distances_buildtree at Base 2.5-7
+ fatal_util at Base 2.5-7
+ find_path_buildtree at Base 2.5-7
+ free_Cluster at Base 2.5-7
+ free_ClusterGroup at Base 2.5-7
+ free_DistanceMatrix at Base 2.5-7
+ free_Sequence at Base 2.5-7
+ free_Tnode at Base 2.5-7
+ free_Tree at Base 2.5-7
+ free_util at Base 2.5-7
+ get_option at Base 2.5-7
+ get_root_Tnode at Base 2.5-7
+ index_DistanceMatrix at Base 2.5-7
+ leaf_find_buildtree at Base 2.5-7
+ malloc_util at Base 2.5-7
+ merge_Cluster at Base 2.5-7
+ neighbour_joining_buildtree at Base 2.5-7
+ new_interior_Tnode at Base 2.5-7
+ new_leaf_Tnode at Base 2.5-7
+ print_DistanceMatrix at Base 2.5-7
+ read_newhampshire_Tnode at Base 2.5-7
+ read_newhampshire_Tree at Base 2.5-7
+ read_phylip_DistanceMatrix at Base 2.5-7
+ realloc_util at Base 2.5-7
+ scale_bootstraps_Tnode at Base 2.5-7
+ scale_bootstraps_Tree at Base 2.5-7
+ single_Cluster_ClusterGroup at Base 2.5-7
+ single_Sequence_Cluster at Base 2.5-7
+ update_bootstraps_Tnode at Base 2.5-7
+ update_bootstraps_Tree at Base 2.5-7
+ warning_util at Base 2.5-7
+ write_MUL_flattened_Tnode at Base 2.5-7
+ write_MUL_flattened_Tree at Base 2.5-7
+ write_clustering_data_Tnode at Base 2.5-7
+ write_debug_Tnode at Base 2.5-7
+ write_debug_Tree at Base 2.5-7
+ write_newhampshire_Cluster at Base 2.5-7
+ write_newhampshire_Tnode at Base 2.5-7
+ write_newhampshire_Tree at Base 2.5-7
+ write_phylip_DistanceMatrix at Base 2.5-7
=====================================
debian/patches/build_shared_library.patch
=====================================
@@ -0,0 +1,57 @@
+Description: Build a PIC shared library in addition to the static one
+ QuickTree only builds the executable. Debian additionally builds a static
+ libquicktree.a (create_lib.patch), but that archive is not built with -fPIC
+ and therefore cannot be linked into a shared library such as libsonlib.so,
+ which has to leave the QuickTree symbols unresolved. Compile separate PIC
+ objects and link them into libquicktree.so.2.5 (soname
+ libquicktree.so.2) so that shared consumers can depend on a normal shared
+ QuickTree library.
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2026-11-06
+Forwarded: no
+Assisted-By: deepseek-v4.1-flash-free
+---
+--- a/Makefile
++++ b/Makefile
+@@ -18,6 +18,8 @@ LIBOBJ = $(OBJ)/buildtree.o \
+ $(OBJ)/sequence.o \
+ $(OBJ)/tree.o \
+
++PICOBJ = $(LIBOBJ:.o=.pic.o)
++
+ QUICKTREEOBJ = $(COMMON) $(OBJ)/quicktree.o $(OBJ)/buildtree.o $(OBJ)/tree.o
+
+
+@@ -28,7 +30,12 @@ CFLAGS += -c -I$(INC)
+
+ LDFLAGS += -g
+
+-all: quicktree libquicktree.a
++SOVERSION = 2
++LIBVERSION = 2.5
++SONAME = libquicktree.so.$(SOVERSION)
++SHAREDLIB = libquicktree.so.$(LIBVERSION)
++
++all: quicktree libquicktree.a $(SHAREDLIB)
+
+ quicktree : $(QUICKTREEOBJ)
+ $(CC) $(LDFLAGS) -o $@ $(QUICKTREEOBJ) -lm
+@@ -36,6 +43,12 @@ quicktree : $(QUICKTREEOBJ)
+ libquicktree.a: $(LIBOBJ)
+ ar rc $@ $(LIBOBJ)
+
++$(SHAREDLIB): $(PICOBJ)
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $(PICOBJ) -lm
++
++$(OBJ)/%.pic.o : $(SRC)/%.c
++ $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -o $@ $<
++
+ $(OBJ)/quicktree.o : $(SRC)/quicktree.c $(INC)/version.h
+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(OBJ)/quicktree.o $(SRC)/quicktree.c
+
+@@ -64,4 +77,4 @@ $(OBJ)/options.o : $(SRC)/options.c $(IN
+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(OBJ)/options.o $(SRC)/options.c
+
+ clean:
+- rm -f $(OBJ)/*.o quicktree
++ rm -f $(OBJ)/*.o quicktree libquicktree.a $(SHAREDLIB)
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ fixMake.patch
create_lib.patch
fix_build_warnings.patch
add_CPPFLAGS.patch
+build_shared_library.patch
=====================================
debian/rules
=====================================
@@ -9,11 +9,21 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
override_dh_auto_build:
sed -i 's/expexted/expected/' src/tree.c
- sed -i 's/optio\\n/option/' src/quicktree.c
+ sed -i 's/optio\\n/option/' src/quicktree.c
dh_auto_build
help2man -i debian/quicktree.htm --no-discard-stderr ./quicktree > quicktree.1
override_dh_auto_clean:
dh_auto_clean
rm -f quicktree.1
- rm -f libquicktree.a
+ rm -f libquicktree.a libquicktree.so.*
+
+execute_after_dh_install:
+ ln -s libquicktree.so.2.5 libquicktree.so.2
+ ln -s libquicktree.so.2 libquicktree.so
+ d-shlibmove \
+ --commit \
+ --multiarch \
+ --devunversioned \
+ --movedev "include/*" usr/include/quicktree \
+ libquicktree.so
=====================================
debian/tests/control
=====================================
@@ -1,4 +1,3 @@
Tests: run-unit-test
-Depends: @
+Depends: @, build-essential
Restrictions: allow-stderr
-
=====================================
debian/tests/run-unit-test
=====================================
@@ -14,6 +14,24 @@ cd "${AUTOPKGTEST_TMP}"
gunzip -r *
echo 'Test Basic functionality'
-quicktree -upgma -boot 0 cysprot.stockholm
+quicktree -upgma -boot 0 cysprot.stockholm
echo 'PASS'
+echo 'Test the shared library'
+cat > test.c <<'EOF'
+#include <quicktree/cluster.h>
+
+int main(void)
+{
+ struct ClusterGroup *group = empty_ClusterGroup();
+ if (group == NULL)
+ return 1;
+ free_ClusterGroup(group);
+ return 0;
+}
+EOF
+
+cc -Wall -I/usr/include/quicktree -o test test.c -lquicktree
+ldd test | grep -q 'libquicktree\.so\.2'
+./test
+echo 'PASS'
View it on GitLab: https://salsa.debian.org/med-team/quicktree/-/compare/6af63e55080f18eb05feae2e706faa51b2ebff3f...7c4b8a9c553fd5065e9cf0b6ff7d90b4796f59ad
--
View it on GitLab: https://salsa.debian.org/med-team/quicktree/-/compare/6af63e55080f18eb05feae2e706faa51b2ebff3f...7c4b8a9c553fd5065e9cf0b6ff7d90b4796f59ad
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/20261106/4994de20/attachment-0001.htm>
More information about the debian-med-commit
mailing list