Michael R. Crusoe pushed to branch master at Debian Med / spdlog
Commits: b849fdd9 by Michael R. Crusoe at 2021-09-17T14:59:59+02:00 Ignore vendored copy of catch.hpp; use the one from the catch2 package instead. Closes: #993511 - - - - - 4 changed files: - debian/changelog - debian/control - debian/patches/series - + debian/patches/use_system_catch.hpp Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +spdlog (1:1.8.5+ds-3) unstable; urgency=medium + + * Ignore vendored copy of catch.hpp; use the one from the catch2 + package instead. Closes: #993511 + + -- Michael R. Crusoe <[email protected]> Fri, 17 Sep 2021 14:59:55 +0200 + spdlog (1:1.8.5+ds-2) unstable; urgency=medium * Fix autopkgtests by tweaking our patch and matching compilation flags ===================================== debian/control ===================================== @@ -8,7 +8,8 @@ Build-Depends: debhelper-compat (= 13), pkg-config, libsystemd-dev [linux-any], libfmt-dev (>= 6.1.2+ds), - pkg-kde-tools + pkg-kde-tools, + catch2 Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/med-team/spdlog Vcs-Git: https://salsa.debian.org/med-team/spdlog.git @@ -20,6 +21,7 @@ Architecture: any Multi-Arch: same Depends: libspdlog1 (= ${binary:Version}), libfmt-dev (>= 6.1.2+ds), + catch2, ${misc:Depends} Description: Very fast, header only or compiled, C++ logging library Features: Very fast - performance is the primary goal; Headers only; No ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ autopkgtest use-external-fmt.patch +use_system_catch.hpp ===================================== debian/patches/use_system_catch.hpp ===================================== @@ -0,0 +1,27 @@ +Author: Michael R. Crusoe <[email protected]> +Description: Use the packaged version of catch.hpp +Forwarded: not-needed +--- spdlog.orig/tests/includes.h ++++ spdlog/tests/includes.h +@@ -1,6 +1,6 @@ + #pragma once + +-#include "catch.hpp" ++#include <catch2/catch.hpp> + #include "utils.h" + #include <chrono> + #include <cstdio> +@@ -23,4 +23,4 @@ + #include "spdlog/sinks/ostream_sink.h" + #include "spdlog/sinks/rotating_file_sink.h" + #include "spdlog/sinks/stdout_color_sinks.h" +-#include "spdlog/pattern_formatter.h" +\ No newline at end of file ++#include "spdlog/pattern_formatter.h" +--- spdlog.orig/tests/main.cpp ++++ spdlog/tests/main.cpp +@@ -1,2 +1,2 @@ + #define CATCH_CONFIG_MAIN +-#include "catch.hpp" +\ No newline at end of file ++#include <catch2/catch.hpp> View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/commit/b849fdd93163bd4af3abc1d90d955c9d0441361a -- View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/commit/b849fdd93163bd4af3abc1d90d955c9d0441361a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
