From: Raspbian forward pporter Date: Sat, 29 Dec 2018 10:36:48 +0000 (+0000) Subject: Merge version 1.12.2+dfsg-1+rpi1 and 1.12.2+dfsg-2 to produce 1.12.2+dfsg-2+rpi1 X-Git-Tag: archive/raspbian/1.12.2+dfsg-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=169bb88fd4ff6125681f45080bc6bf562e4ded51;p=qbs.git Merge version 1.12.2+dfsg-1+rpi1 and 1.12.2+dfsg-2 to produce 1.12.2+dfsg-2+rpi1 --- 169bb88fd4ff6125681f45080bc6bf562e4ded51 diff --cc debian/changelog index f19b71e9,fb62ea56..6bd6fe94 --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,8 +1,24 @@@ - qbs (1.12.2+dfsg-1+rpi1) buster-staging; urgency=medium ++qbs (1.12.2+dfsg-2+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green at Tue, 06 Feb 2018 00:27:38 +0000] + * Add symbols file hack for Raspbian. + * Fix clean target. + + [changes introduced in 1.12.1+dfsg-2+rpi1 by Peter Michael Green] + * Disable testsuite. + + [changes introduced in 1.12.2+dfsg-1+rpi1 by Peter Michael Green] + * Mark another symbol as optional. I'm guessing the presence or absesne of + this one depends on optimisation descisions by the compiler and/or the + version of libstdc++ + - -- Peter Michael Green Sun, 16 Dec 2018 12:54:39 +0000 ++ -- Raspbian forward porter Sat, 29 Dec 2018 10:36:48 +0000 ++ + qbs (1.12.2+dfsg-2) unstable; urgency=medium + + * Add a patch to fix segfault with --log-level debug (closes: #917066). + + -- Dmitry Shachnev Sun, 23 Dec 2018 00:32:11 +0300 qbs (1.12.2+dfsg-1) unstable; urgency=medium