Hi, I've attached some suggested changes for your package, with explanations for each below: - Update d/copyright There are some missing copyright holders and files. - d/watch: Use tarballs provided by GitHub It looks like your pristine-tar branch contains the GitHub-generated tarball, so debian/watch should download that as well rather than using git mode. - d/control: Add <!nocheck> profile restriction to doctest-dev build-dep This means that if the nocheck profile is used (to skip tests during package build), then the doctest-dev build dependency will not be installed. TODO: -DQUILL_BUILD_TESTS should be OFF in d/rules when nocheck profile is enabled. - d/rules: Remove unnecessary override_dh_auto_test There is no need to override this, the default will run all tests fine. TODO: With this change, there is one test that fails: 47: [doctest] doctest version is "2.4.11" 47: [doctest] run with "--help" for options 47: =============================================================================== 47: ./test/unit_tests/PatternFormatterTest.cpp:497: 47: TEST SUITE: PatternFormatter 47: TEST CASE: pattern_formatter_source_location_prefix 47: 47: ./test/unit_tests/PatternFormatterTest.cpp:534: FATAL ERROR: REQUIRE_EQ( formatted_string, expected_string ) is NOT correct! 47: values: REQUIRE_EQ( cpp:504 47: , test/unit_tests/PatternFormatterTest.cpp:504 47: ) 47: 47: =============================================================================== 47: [doctest] test cases: 1 | 0 passed | 1 failed | 15 skipped 47: [doctest] assertions: 1 | 0 passed | 1 failed | 47: [doctest] Status: FAILURE! - Add autopkgtest suite For more information, see https://people.debian.org/~eriberto/README.package-tests.html This "provides as-installed testing of Debian packages" alongside tests run during package build. If you would like your Salsa repo to be moved under the debian/ group, add myself (@Maytha8) as the owner. Once you've had a look and the TODOs are addressed, I will be happy to upload this for you. -- Maytham
From c22c0658580177a68e4be33ddd604d1db675d0f1 Mon Sep 17 00:00:00 2001
From: Maytham Alsudany <maytham@debian.org>
Date: Sat, 2 Aug 2025 12:33:08 +0800
Subject: [PATCH 5/5] Add autopkgtest suite
---
debian/tests/CMakeLists.txt | 7 +++++++
debian/tests/control | 2 ++
debian/tests/upstream-tests | 19 +++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 100644 debian/tests/CMakeLists.txt
create mode 100644 debian/tests/control
create mode 100644 debian/tests/upstream-tests
diff --git a/debian/tests/CMakeLists.txt b/debian/tests/CMakeLists.txt
new file mode 100644
index 0000000..b29589a
--- /dev/null
+++ b/debian/tests/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.12...4.0)
+project(quill)
+
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+include(QuillUtils)
+enable_testing()
+add_subdirectory(test)
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..c93a8a5
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: upstream-tests
+Depends: @, cmake, doctest-dev
diff --git a/debian/tests/upstream-tests b/debian/tests/upstream-tests
new file mode 100644
index 0000000..81a6810
--- /dev/null
+++ b/debian/tests/upstream-tests
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -eu
+
+mkdir -p "$AUTOPKGTEST_TMP"
+cp -r test "$AUTOPKGTEST_TMP"/test
+cp -r cmake "$AUTOPKGTEST_TMP"/cmake
+cp debian/tests/CMakeLists.txt "$AUTOPKGTEST_TMP"/CMakeLists.txt
+
+sed -i "s%target_link_libraries(\${TEST_NAME} quill)%%" \
+ "$AUTOPKGTEST_TMP"/test/integration_tests/CMakeLists.txt \
+ "$AUTOPKGTEST_TMP"/test/unit_tests/CMakeLists.txt
+
+mkdir -p "$AUTOPKGTEST_TMP"/build
+cd "$AUTOPKGTEST_TMP"/build
+
+cmake ..
+make
+make test
--
2.50.1
From d4e7a26c6251175d6bec7eebcbc313938c58bc73 Mon Sep 17 00:00:00 2001 From: Maytham Alsudany <maytham@debian.org> Date: Sat, 2 Aug 2025 12:33:03 +0800 Subject: [PATCH 4/5] d/rules: Remove unnecessary override_dh_auto_test --- debian/rules | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index f8c8d14..3211551 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,4 @@ override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ - -DQUILL_BUILD_TESTS=ON \ - -override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - cd obj-*/test && ctest --build-config Release --output-on-failure -R ^multi_frontend_threads$ -endif + -DQUILL_BUILD_TESTS=ON -- 2.50.1
From 2ad4cede110f347901fa5abc9fdb076354bffe6a Mon Sep 17 00:00:00 2001 From: Maytham Alsudany <maytham@debian.org> Date: Sat, 2 Aug 2025 12:32:46 +0800 Subject: [PATCH 3/5] d/control: Add <!nocheck> profile restriction to doctest-dev build-dep --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 926d6b1..237aafe 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), cmake, - doctest-dev, + doctest-dev <!nocheck>, Standards-Version: 4.7.2 Homepage: https://github.com/odygrd/quill Vcs-Browser: https://salsa.debian.org/syed/quill -- 2.50.1
From 05379fccf547ca16640704770444f3025505d50f Mon Sep 17 00:00:00 2001 From: Maytham Alsudany <maytham@debian.org> Date: Sat, 2 Aug 2025 12:32:27 +0800 Subject: [PATCH 2/5] d/watch: Use tarballs provided by GitHub --- debian/watch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/watch b/debian/watch index 38b8be5..1af7f5f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,5 @@ version=4 -opts="mode=git" https://github.com/odygrd/quill.git \ - refs/tags/v([\d\.]+) - +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\ + uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/$1~$2$3/" \ + https://github.com/odygrd/quill/tags \ + .*/v?(\d[\d\.]*)\.tar\.gz -- 2.50.1
From 6942ae3141af2db7e90b2f8a6d64f7c3a8f4a4f3 Mon Sep 17 00:00:00 2001 From: Maytham Alsudany <maytham@debian.org> Date: Sat, 2 Aug 2025 12:32:05 +0800 Subject: [PATCH 1/5] Update d/copyright --- debian/copyright | 49 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/debian/copyright b/debian/copyright index 2a0ead0..00dbdac 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,19 +6,62 @@ Upstream-Contact: https://github.com/odygrd/quill/issues Files: * Copyright: - 2020-2025 Odysseas Georgoudis + 2020-2025 Odysseas Georgoudis and quill contributors License: Expat Files: - debian/* + include/quill/bundled/fmt/* Copyright: - 2025 Syed Shahrukh Hussain <syed.shahrukh@ossrevival.org> + 2012-2025 Victor Zverovich and fmt contributors +License: Expat + +Files: + include/quill/bundled/fmt/chrono.h +Copyright: + 2012-2025 Victor Zverovich and fmt contributors + 2019 Paul Dreik License: Expat Files: test/bundled/doctest/* Copyright: 2016-2019 Viktor Kirilov License: Expat +Files: + include/quill/bundled/fmt/format.h +Copyright: + 2012-2025 Victor Zverovich and fmt contributors +License: Expat with fmt exception + 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 to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + 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 AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + --- Optional exception to the license --- + . + As an exception, if, as a result of your compiling your source code, portions + of this Software are embedded into a machine-executable object form of such + source code, you may redistribute such embedded portions in such object form + without including the above copyright and permission notices. + +Files: + debian/* +Copyright: + 2025 Syed Shahrukh Hussain <syed.shahrukh@ossrevival.org> +License: Expat + License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -- 2.50.1
Attachment:
signature.asc
Description: This is a digitally signed message part