diff -Nru log4cplus-2.0.5/debian/changelog log4cplus-2.0.5/debian/changelog --- log4cplus-2.0.5/debian/changelog 2020-11-03 17:38:12.000000000 +0000 +++ log4cplus-2.0.5/debian/changelog 2021-01-12 15:48:11.000000000 +0000 @@ -1,3 +1,11 @@ +log4cplus (2.0.5-3) unstable; urgency=medium + + * Dont leak Catch symbols in shared library by building without unit-tests + for the package. To ensure that unit tests are still run, build the library + with unit-tests separately. Closes: #978617. + + -- Tobias Frost Tue, 12 Jan 2021 16:48:11 +0100 + log4cplus (2.0.5-2) unstable; urgency=medium * Upload to unstable. diff -Nru log4cplus-2.0.5/debian/control log4cplus-2.0.5/debian/control --- log4cplus-2.0.5/debian/control 2020-11-03 17:38:12.000000000 +0000 +++ log4cplus-2.0.5/debian/control 2020-11-03 19:22:32.000000000 +0000 @@ -1,8 +1,9 @@ Source: log4cplus Section: libs Priority: optional -Maintainer: Tobias Frost -Uploaders: Andrew Pollock +Maintainer: Andrew Pollock +Uploaders: + Tobias Frost Build-Depends: cmake, catch, diff -Nru log4cplus-2.0.5/debian/rules log4cplus-2.0.5/debian/rules --- log4cplus-2.0.5/debian/rules 2020-11-03 17:38:06.000000000 +0000 +++ log4cplus-2.0.5/debian/rules 2021-01-12 15:17:55.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f - +DH_VERBOSE=1 export DEB_CXXFLAGS_MAINT_APPEND := --std=c++11 export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -8,6 +8,19 @@ %: dh $@ --buildsystem=cmake +override_dh_auto_clean: + dh_auto_clean + # building tests separately, see #978617 + dh_auto_clean --builddirectory build-with-tests + +override_dh_auto_configure-arch: + dh_auto_configure -- -DWITH_UNIT_TESTS=OFF + dh_auto_configure --builddirectory build-with-tests + +override_dh_auto_build-arch: + dh_auto_build + dh_auto_build --builddirectory build-with-tests + override_dh_strip: dh_strip --dbgsym-migration='liblog4cplus-dbg (<< 1.1.2-4~)' @@ -22,6 +35,9 @@ dh_link jdupes -rl debian/liblog4cplus-doc/usr/share/doc/liblog4cplus-dev/html/ +override_dh_auto_test-arch: + dh_auto_test --builddirectory build-with-tests + +# nothing todo for indep: override_dh_auto_install-indep: override_dh_auto_test-indep: - @echo nop for indep.