From: Peter Michael Green Date: Tue, 3 Jun 2025 11:24:08 +0000 (+0000) Subject: Manual merge of version 3.17.2-1+rpi1 and 3.17.2-2 to produce 3.17.2-2+rpi1 X-Git-Tag: archive/raspbian/3.17.2-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=843a748aed2ff575e34edf804a978f0b8f33d116;p=fuse3.git Manual merge of version 3.17.2-1+rpi1 and 3.17.2-2 to produce 3.17.2-2+rpi1 --- 36eba28dbae70e6230dde259c28719cdb0caa192 diff --cc debian/changelog index e548218,0430c95..19de5db --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,16 +1,23 @@@ - fuse3 (3.17.2-1+rpi1) trixie-staging; urgency=medium ++fuse3 (3.17.2-2+rpi1) trixie-staging; urgency=medium + ++ [changes brought forward from 3.17.2-1+rpi1 by Peter Michael Green at Fri, 16 May 2025 19:59:04 +0000] + * Link with libatomic on raspbian too. + - -- Peter Michael Green Fri, 16 May 2025 19:59:04 +0000 ++ -- Peter Michael Green Tue, 03 Jun 2025 11:23:19 +0000 ++ + fuse3 (3.17.2-2) unstable; urgency=medium + + [ Laszlo Boszormenyi (GCS) ] + * Backport upstream fixes (closes: #1101305): + - make conn->want/want_ext conversion non fatal, + - add container_of and ROUND_UP macros, + - conn->want conversion: fix fuse_apply_conn_info_opts() . + * Update symbols file (closes: #1105099). + + [ Helmut Grohne ] + * Update -latomic architecture list (closes: #1105150). + + -- Laszlo Boszormenyi (GCS) Mon, 19 May 2025 20:39:08 +0200 fuse3 (3.17.2-1) unstable; urgency=medium diff --cc debian/rules index 0a0b24c,fcac031..ca9a8bb --- a/debian/rules +++ b/debian/rules @@@ -10,7 -10,7 +10,7 @@@ include /usr/share/dpkg/architecture.m export DEB_BUILD_MAINT_OPTIONS = hardening=+all - ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k powerpc)) -ifneq (,$(filter $(DEB_HOST_ARCH), arc armel m68k mips mipsel powerpc sh3 sh4 sparc)) ++ifneq (,$(filter $(DEB_HOST_ARCH), arc armel armhf m68k mips mipsel powerpc sh3 sh4 sparc)) export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -latomic endif