From: Raspbian automatic forward porter Date: Mon, 11 Jan 2021 04:08:06 +0000 (+0000) Subject: Merge version 14.2.15-3+rpi1 and 14.2.15-4 to produce 14.2.15-4+rpi1 X-Git-Tag: archive/raspbian/14.2.15-4+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b162e0c8e65d96e2e3d22bfb4f056406aa4b1d5c;p=ceph.git Merge version 14.2.15-3+rpi1 and 14.2.15-4 to produce 14.2.15-4+rpi1 --- 5cf08131b93db0e1cef011a0624a6ed39721ae61 diff --cc debian/changelog index 0970e8f22,70c73d46c..0d61ee349 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,8 +1,21 @@@ - ceph (14.2.15-3+rpi1) bullseye-staging; urgency=medium ++ceph (14.2.15-4+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 09:48:17 +0000] + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. + + [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green] + * Remove problematic gitattributes files. + * Disable neon on armhf too. + - -- Peter Michael Green Thu, 10 Dec 2020 19:21:33 +0000 ++ -- Raspbian forward porter Mon, 11 Jan 2021 04:08:05 +0000 ++ + ceph (14.2.15-4) unstable; urgency=medium + + * Add upstream 3 patches for libboost 1.74 (Closes: #977243). + + -- Thomas Goirand Sun, 13 Dec 2020 16:33:57 +0100 ceph (14.2.15-3) unstable; urgency=medium diff --cc debian/patches/series index 5aa4bd494,ffd427074..fe2876480 --- a/debian/patches/series +++ b/debian/patches/series @@@ -15,5 -15,6 +15,8 @@@ add-option-to-disable-ceph-dencoder.pat riscv64-link-pthread.patch mds-purgequeue-use_uint64_t.patch make-ceph-python-3.9-aware.patch + cmake_define_BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT_for_Boost.Asio_users.patch + cmake_add_1.74_to_known_versions.patch + another-cmakelists-fix.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch