diff -Nru spdlog-1.5.0+ds/debian/changelog spdlog-1.5.0+ds/debian/changelog --- spdlog-1.5.0+ds/debian/changelog 2020-06-22 15:20:18.000000000 +0000 +++ spdlog-1.5.0+ds/debian/changelog 2020-06-25 09:11:24.000000000 +0000 @@ -1,3 +1,13 @@ +spdlog (1:1.5.0+ds-5+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1:1.1.0-2+rpi1 by Peter Michael Green at Wed, 10 Oct 2018 00:49:48 +0000] + * use libatomic on armhf too for raspbian. + + [changes introduced in 1:1.5.0-1+rpi1 by Peter Michael Green] + * Add symbols file hack for Raspbian. + + -- Raspbian forward porter Thu, 25 Jun 2020 09:11:24 +0000 + spdlog (1:1.5.0+ds-5) unstable; urgency=medium [ Matthias Klose ] diff -Nru spdlog-1.5.0+ds/debian/rules spdlog-1.5.0+ds/debian/rules --- spdlog-1.5.0+ds/debian/rules 2020-06-22 15:12:51.000000000 +0000 +++ spdlog-1.5.0+ds/debian/rules 2020-06-25 09:11:24.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc powerpcspe sh4)) +ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k mips mipsel powerpc powerpcspe sh4)) export DEB_LDFLAGS_MAINT_APPEND=-latomic endif @@ -15,6 +15,7 @@ # dh_auto_configure -- -Denable_tests=true -Dexternal_fmt=true -Dlibrary_type=shared override_dh_auto_configure: + sed -i 's/(arch=!armel !riscv64)/(optional=meh)/' debian/libspdlog*.symbols rm -Rf include/spdlog/fmt/bundled/ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES))) dh_auto_configure -- -DSPDLOG_BUILD_EXAMPLE=ON \ @@ -41,3 +42,7 @@ rm -f example/logs/.gitignore dh_auto_install find debian -name .gitignore -delete + +override_dh_auto_clean: + dh_auto_clean + sed -i 's/(optional=meh)/(arch=!armel !riscv64)/' debian/libspdlog*.symbols