From: Peter Michael Green Date: Fri, 6 Mar 2020 16:13:52 +0000 (+0000) Subject: Manual merge of version 1:1.5.0-1+rpi1 and 1:1.5.0+ds-3 to produce 1:1.5.0+ds-3+rpi1 X-Git-Tag: archive/raspbian/1%1.5.0+ds-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a4aae6a7165931a93c6db48185e935185ba8ebd5;p=spdlog.git Manual merge of version 1:1.5.0-1+rpi1 and 1:1.5.0+ds-3 to produce 1:1.5.0+ds-3+rpi1 --- a4aae6a7165931a93c6db48185e935185ba8ebd5 diff --cc debian/changelog index ec9bd70,c54eec2..c8f530c --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,35 +1,45 @@@ - spdlog (1:1.5.0-1+rpi1) bullseye-staging; urgency=medium ++spdlog (1:1.5.0+ds-3+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. + - -- Peter Michael Green Tue, 18 Feb 2020 14:01:31 +0000 ++ -- Raspbian forward porter Thu, 05 Mar 2020 19:56:41 +0000 ++ + spdlog (1:1.5.0+ds-3) unstable; urgency=medium + + * Speed up nocheck build profile by not building the tests & example + + -- Michael R. Crusoe Tue, 03 Mar 2020 11:44:57 +0100 + + spdlog (1:1.5.0+ds-3~rc1) experimental; urgency=medium + + * Hopefully the final symbols refresh for 1.5.0 + + -- Michael R. Crusoe Tue, 03 Mar 2020 08:50:12 +0100 + + spdlog (1:1.5.0+ds-3~rc0) experimental; urgency=medium + + * Depend on newer libfmt (Closes: #952625) + * libspdlog-dev is Multi-Arch: same + + -- Michael R. Crusoe Sun, 01 Mar 2020 11:45:33 +0100 + + spdlog (1:1.5.0+ds-2) unstable; urgency=medium + + * Add Build-Depends-Package meta-information field + * Refresh symbols + + -- Michael R. Crusoe Wed, 26 Feb 2020 11:14:14 +0100 + + spdlog (1:1.5.0+ds-1) unstable; urgency=medium + + * Mark libspdlog1 as Multi-Arch: same + * Repack source to remove newer libfmt (Closes: #952543) + + -- Michael R. Crusoe Tue, 25 Feb 2020 19:22:37 +0100 spdlog (1:1.5.0-1) unstable; urgency=medium diff --cc debian/rules index 218c85d,f20dd81..96215b7 --- a/debian/rules +++ b/debian/rules @@@ -15,7 -15,8 +15,9 @@@ export DEB_BUILD_MAINT_OPTIONS=hardenin # 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 \ -DSPDLOG_BUILD_EXAMPLE_HO=ON \ -DSPDLOG_BUILD_TESTS=ON \