From: Raspbian automatic forward porter Date: Tue, 18 Feb 2020 05:15:07 +0000 (+0000) Subject: Manual merge of version 1:1.3.1-1+rpi1 and 1:1.5.0-1 to produce 1:1.5.0-1+rpi1 X-Git-Tag: archive/raspbian/1%1.5.0-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b27dca3acc76a39059e074cf7c08dd5cd4be58cb;p=spdlog.git Manual merge of version 1:1.3.1-1+rpi1 and 1:1.5.0-1 to produce 1:1.5.0-1+rpi1 --- b27dca3acc76a39059e074cf7c08dd5cd4be58cb diff --cc debian/changelog index 24eb9a1,d8202a3..2b47637 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,25 +1,32 @@@ - spdlog (1:1.3.1-1+rpi1) buster-staging; urgency=medium ++spdlog (1:1.5.0-1+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. + - -- Raspbian forward porter Fri, 25 Jan 2019 23:41:22 +0000 ++ -- Peter Michael Green Tue, 18 Feb 2020 14:01:31 +0000 ++ + spdlog (1:1.5.0-1) unstable; urgency=medium + + * Release to unstable with updated symbols + + -- Michael R. Crusoe Sun, 09 Feb 2020 09:14:13 +0100 + + spdlog (1:1.5.0-1~rc1) experimental; urgency=medium + + * Include symbols file + + -- Michael R. Crusoe Sat, 08 Feb 2020 15:28:01 +0100 + + spdlog (1:1.5.0-1~rc0) experimental; urgency=medium + + * New upstream version + * debhelper-compat 12 + * Standards-Version: 4.5.0 + * Set upstream metadata fields: Name. + * Set upstream metadata fields: Repository. + * Remove obsolete fields Name from debian/upstream/metadata. + + -- Michael R. Crusoe Fri, 07 Feb 2020 12:22:39 +0100 spdlog (1:1.3.1-1) unstable; urgency=medium diff --cc debian/rules index 2a8b595,0ebff6d..2c41196 --- a/debian/rules +++ b/debian/rules @@@ -1,6 -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