[med-svn] [Git][med-team/adapterremoval][master] 13 commits: Revert "Build-Depends: pybuild-plugin-pyproject (routine-update)"

Andreas Tille (@tille) gitlab at salsa.debian.org
Wed Nov 11 11:02:42 GMT 2026



Andreas Tille pushed to branch master at Debian Med / adapterremoval


Commits:
0d8d45aa by Andreas Tille at 2026-11-11T10:40:35+01:00
Revert "Build-Depends: pybuild-plugin-pyproject (routine-update)"

This reverts commit f9767760c75011df76db878896f01596bda991e3.

- - - - -
b24abf59 by Andreas Tille at 2026-11-11T10:41:34+01:00
Adapt Build-Depends to new upstream version

- - - - -
4a6b43d6 by Andreas Tille at 2026-11-11T10:45:11+01:00
Use meson consistently instead of the upstream Makefile wrapper

- - - - -
79b401b8 by Andreas Tille at 2026-11-11T10:46:28+01:00
Run the regression test runner using the system python3

- - - - -
f0b49802 by Andreas Tille at 2026-11-11T10:47:16+01:00
Trust Debian hardening flags and deactivate upstreams attempt

- - - - -
c677d50b by Andreas Tille at 2026-11-11T10:47:55+01:00
Fix typo

- - - - -
bb5f4369 by Andreas Tille at 2026-11-11T10:49:00+01:00
README is now md and not html

- - - - -
3c359121 by Andreas Tille at 2026-11-11T11:12:55+01:00
Inform users about name change in binary in NEWS.debian

- - - - -
f91cd3ab by Andreas Tille at 2026-11-11T11:13:08+01:00
Migrate the installed examples to correct place

- - - - -
433ac33e by Andreas Tille at 2026-11-11T11:26:29+01:00
Fix installation of README

- - - - -
c1854453 by Andreas Tille at 2026-11-11T11:55:19+01:00
Update d/copyright and add d/lrc.config

- - - - -
e10165a3 by Andreas Tille at 2026-11-11T11:57:52+01:00
Update autopkgtest

- - - - -
58d41c9c by Andreas Tille at 2026-11-11T12:00:57+01:00
Upload to unstable

- - - - -


13 changed files:

- debian/README.test
- debian/adapterremoval-examples.install
- + debian/adapterremoval.NEWS.debian
- debian/adapterremoval.docs
- debian/adapterremoval.install
- debian/adapterremoval.manpages
- debian/changelog
- debian/control
- debian/copyright
- + debian/lrc.config
- debian/rules
- debian/tests/control
- debian/tests/run-unit-test


Changes:

=====================================
debian/README.test
=====================================
@@ -1,7 +1,7 @@
 Notes on how this package can be tested.
 ────────────────────────────────────────
 
-To run the unit tests provided by the package can run
+To run the unit tests provided by the package, run
 
    sh run-unit-test
 


=====================================
debian/adapterremoval-examples.install
=====================================
@@ -1 +1 @@
-examples	usr/share/doc/adapterremoval
+usr/share/adapterremoval3/examples	usr/share/doc/adapterremoval


=====================================
debian/adapterremoval.NEWS.debian
=====================================
@@ -0,0 +1,6 @@
+adapterremoval (3.0.2-1) unstable; urgency=medium
+
+ * In adpapterremoval 3 the executable was renamed from AdapterRemoval
+   to adapterremoval3
+
+ -- Andreas Tille <tille at debian.org>  Tue, 10 Nov 2026 20:29:29 +0100


=====================================
debian/adapterremoval.docs
=====================================
@@ -1,3 +1,3 @@
-README.html
+usr/share/adapterremoval3/README.md
 debian/README.test
 debian/tests/run-unit-test


=====================================
debian/adapterremoval.install
=====================================
@@ -1 +1 @@
-build/AdapterRemoval	usr/bin
+usr/bin/adapterremoval3


=====================================
debian/adapterremoval.manpages
=====================================
@@ -1 +1 @@
-AdapterRemoval.1
+usr/share/man/man1/adapterremoval3.1


=====================================
debian/changelog
=====================================
@@ -1,17 +1,22 @@
-adapterremoval (3.0.2-1) UNRELEASED; urgency=medium
+adapterremoval (3.0.2-1) unstable; urgency=medium
 
-  * New upstream version
   * d/watch: version=5
+  * New upstream version
   * Standards-Version: 4.7.4 (routine-update)
   * Reflow Uploaders field (cme)
   * Remove Priority field (cme)
-  * Build-Depends: pybuild-plugin-pyproject (routine-update)
   * Drop 'Rules-Requires-Root: no' from d/control (routine-update)
   * d/source/options: Remove .gitattributes which causes changed line endings
     in some data filed
-  * Build-Depends: cmake, meson, libisal-dev, libdeflate-dev, python3-sphinx
-
- -- Andreas Tille <tille at debian.org>  Tue, 10 Nov 2026 20:29:29 +0100
+  * Adapt Build-Depends to new upstream version
+  * Use meson consistently instead of the upstream Makefile wrapper
+  * Run the regression test runner using the system python3
+  * Trust Debian hardening flags and deactivate upstreams attempt
+  * Inform users about name change in binary in NEWS.debian
+  * Update d/copyright and add d/lrc.config
+  * Update autopkgtest
+
+ -- Andreas Tille <tille at debian.org>  Wed, 11 Nov 2026 11:57:59 +0100
 
 adapterremoval (2.3.4-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -7,16 +7,13 @@ Uploaders:
 Section: science
 Build-Depends:
  debhelper-compat (= 14),
- cmake,
- pybuild-plugin-pyproject,
- discount,
- libbz2-dev,
+ meson,
+ ninja-build,
+ pkgconf,
  libdeflate-dev,
- libgtest-dev,
  libisal-dev,
- meson,
+ python3-fastjsonschema,
  python3-sphinx,
- zlib1g-dev,
 Vcs-Browser: https://salsa.debian.org/med-team/adapterremoval
 Vcs-Git: https://salsa.debian.org/med-team/adapterremoval.git
 Homepage: https://github.com/MikkelSchubert/adapterremoval


=====================================
debian/copyright
=====================================
@@ -7,9 +7,9 @@ Files: *
 Copyright: 2012-2016 Mikkel Schubert, Stinus Lindgreen and Ludovic Orlando
 License: GPL-3+
 
-Files: tests/regression/run
-Copyright: 2014-2015 Mikkel Schubert
-License: expat
+Files: src/robin_hood.hpp
+Copyright: 2018-2021 Martin Ankerl <http://martin.ankerl.com>
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -28,6 +28,33 @@ License: expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
+Files: tests/unit/catch.hpp
+Copyright: 2022 Two Blue Cubes Ltd
+License: BSL-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
 Files: debian/*
 Copyright: 2016 Andreas Tille <tille at debian.org>
 License: GPL-3+


=====================================
debian/lrc.config
=====================================
@@ -0,0 +1,3 @@
+LICENSES/BSL-1.0
+LICENSES/MIT
+


=====================================
debian/rules
=====================================
@@ -6,27 +6,30 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 include /usr/share/dpkg/default.mk
 
+# Upstream's top-level Makefile is only a developer convenience wrapper around
+# meson; force debhelper to use the meson buildsystem, so that the makefile
+# buildsystem is not autoselected (it has priority in debhelper's list)
+BUILDDIR := obj-$(DEB_HOST_GNU_TYPE)
+
 %:
-	dh $@
+	dh $@ --buildsystem=meson+ninja
+
+override_dh_auto_configure:
+	# harden=false: upstream adds -D_FORTIFY_SOURCE=3 on top of the
+	#   -D_FORTIFY_SOURCE=2 set by dpkg-buildflags; a fatal redefinition
+	# uv=disabled: run the regression test runner using the system python3
+	#   instead of letting uv download dependencies (uv is not in Debian;
+	#   the only requirement, fastjsonschema, is python3-fastjsonschema)
+	dh_auto_configure -- -Dharden=false -Duv=disabled
 
 override_dh_auto_build:
 	dh_auto_build
-	markdown README.md > README.html
+	meson compile -C $(BUILDDIR) man
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	# dh_auto_test
-	make test
-	make clean_tests
+	meson compile -C $(BUILDDIR) run-unit-tests run-regression-tests
 endif
 
-override_dh_auto_install:
-	make PREFIX=$(CURDIR)/debian/$(DEB_SOURCE)/usr
-	# Hmmm, this does nothing ...
-
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.md
-
-override_dh_fixperms:
-	dh_fixperms
-	find debian -name benchmark.sh -exec chmod +x \{\} \;


=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @
+Depends: @, make
 Restrictions: allow-stderr


=====================================
debian/tests/run-unit-test
=====================================
@@ -4,23 +4,15 @@ pkg=adapterremoval
 if [ "$AUTOPKGTEST_TMP" = "" ] ; then
   AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
 fi
-cd $AUTOPKGTEST_TMP
-cp -a /usr/share/doc/${pkg}/examples/* .
-find . -name "*.gz" -exec gunzip \{\} \;
+cd "$AUTOPKGTEST_TMP"
+cp -a /usr/share/doc/adapterremoval/examples/* .
+gunzip -r *
 
-# examples from README.html
-AdapterRemoval --file1 reads_1.fq --basename output_single --trimns --trimqualities --gzip
-AdapterRemoval --file1 reads_1.fq --file2 reads_2.fq --basename output_paired --trimns --trimqualities --collapse
-AdapterRemoval --interleaved --file1 interleaved.fq --basename output_interleaved
-AdapterRemoval --qualitybase 64 --file1 reads_q64.fq --basename phred_64_encoded
-AdapterRemoval --qualitybase 64 --qualitybase-output 33 --file1 reads_q64.fq --basename phred_33_encoded
+# Upstream ships a Makefile that runs all documented example commands
+make EXE=adapterremoval3
 
-## The documentation has the --collapsed argument which leads to
-# AdapterRemoval --qualitymax 50 --file1 reads_1.fq --file2 reads_2.fq --collapsed --basename collapsed_q50
-#   ERROR: Unknown argument: '--collapsed'
-# so leaving out --collapsed
-AdapterRemoval --qualitymax 50 --file1 reads_1.fq --file2 reads_2.fq --basename collapsed_q50
-
-AdapterRemoval --file1 reads_1.fq --file2 reads_2.fq --basename output_multi --trimns --trimqualities --collapse --adapter-list adapters.txt
-AdapterRemoval --identify-adapters --file1 reads_1.fq --file2 reads_2.fq
-AdapterRemoval --file1 demux_1.fq --file2 demux_2.fq --basename output_dumux --barcode-list barcodes.txt
+test -s output_single.r1.fastq.gz
+test -s output_paired.r1.fastq.gz
+test -s output_paired.r2.fastq.gz
+test -s output_merged.merged.fastq.gz
+test -s output_demux.json



View it on GitLab: https://salsa.debian.org/med-team/adapterremoval/-/compare/ea61b733c1ec06b9183fad6ab1c4a6b163a2f0c2...58d41c9c9ad817ecb79813a904f1f54cd970809e

-- 
View it on GitLab: https://salsa.debian.org/med-team/adapterremoval/-/compare/ea61b733c1ec06b9183fad6ab1c4a6b163a2f0c2...58d41c9c9ad817ecb79813a904f1f54cd970809e
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/20261111/9d70257e/attachment-0001.htm>


More information about the debian-med-commit mailing list