Source: manaplus Version: 1.7.9.2-1 Severity: normal Tags: patch src:doctest just got accepted in Debian unstable and provides /usr/include/doctest/doctest.h in doctest-dev. In order to reduce the use of convenience copies, please patch manaplus to use this file instead of the src/unittests/doctest.h copy. A possible patch is attached.
(I also note that the doctest.h's authorship and license are not represented in d/copyright) Cheers, OdyX
diff -Nru manaplus-1.7.9.2/debian/changelog manaplus-1.7.9.2/debian/changelog --- manaplus-1.7.9.2/debian/changelog 2017-09-12 15:42:48.000000000 +0200 +++ manaplus-1.7.9.2/debian/changelog 2017-10-22 18:17:45.000000000 +0200 @@ -1,3 +1,10 @@ +manaplus (1.7.9.2-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Add doctest-dev Build-Depends and patch to use its doctest.h (Closes: #-1) + + -- Didier Raboud <o...@debian.org> Sun, 22 Oct 2017 18:17:45 +0200 + manaplus (1.7.9.2-1) unstable; urgency=medium * New upstream release. diff -Nru manaplus-1.7.9.2/debian/control manaplus-1.7.9.2/debian/control --- manaplus-1.7.9.2/debian/control 2017-09-12 15:42:48.000000000 +0200 +++ manaplus-1.7.9.2/debian/control 2017-10-22 18:17:45.000000000 +0200 @@ -5,6 +5,7 @@ Maintainer: Patrick Matthäi <pmatth...@debian.org> Standards-Version: 4.1.0 Build-Depends: debhelper (>= 10), + doctest-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libsdl1.2-dev, diff -Nru manaplus-1.7.9.2/debian/patches/series manaplus-1.7.9.2/debian/patches/series --- manaplus-1.7.9.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ manaplus-1.7.9.2/debian/patches/series 2017-10-22 18:09:53.000000000 +0200 @@ -0,0 +1 @@ +use_system_doctest.h diff -Nru manaplus-1.7.9.2/debian/patches/use_system_doctest.h manaplus-1.7.9.2/debian/patches/use_system_doctest.h --- manaplus-1.7.9.2/debian/patches/use_system_doctest.h 1970-01-01 01:00:00.000000000 +0100 +++ manaplus-1.7.9.2/debian/patches/use_system_doctest.h 2017-10-22 18:17:45.000000000 +0200 @@ -0,0 +1,28 @@ +Description: Use Debian-provided /usr/include/doctest/doctest.h instead of the convenience copy +Author: Didier Raboud <o...@debian.org> +Last-Update: 2017-10-22 + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2067,10 +2067,6 @@ + manaplustests_SOURCES += \ + unittests/catch.hpp + endif +-if ENABLE_UNITTESTS_DOCTEST +-manaplustests_SOURCES += \ +- unittests/doctest.h +-endif + + if MINGW + manaplustests_SOURCES += manaplus.rc +--- a/src/maingui.cpp ++++ b/src/maingui.cpp +@@ -60,7 +60,7 @@ + #endif // UNITTESTS_CATCH + #ifdef UNITTESTS_DOCTEST + #define DOCTEST_CONFIG_IMPLEMENT +-#include "unittests/doctest.h" ++#include "doctest/doctest.h" + #endif // UNITTESTS_DOCTEST + #else // UNITTESTS + #include "utils/xml.h"
