From: Raspbian forward pporter Date: Tue, 17 Apr 2018 04:15:49 +0000 (+0100) Subject: Merge version 1.10.1+dfsg-1+rpi1 and 1.11.0+dfsg-1 to produce 1.11.0+dfsg-1+rpi1 X-Git-Tag: archive/raspbian/1.11.0+dfsg-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e40f203f53b189dbb35a0f79498cc05025ff242;p=qbs.git Merge version 1.10.1+dfsg-1+rpi1 and 1.11.0+dfsg-1 to produce 1.11.0+dfsg-1+rpi1 --- 5e40f203f53b189dbb35a0f79498cc05025ff242 diff --cc debian/changelog index e9c54aa5,eb4bc67d..d30eda85 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,18 +1,26 @@@ - qbs (1.10.1+dfsg-1+rpi1) buster-staging; urgency=medium ++qbs (1.11.0+dfsg-1+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. + - -- Raspbian forward porter Thu, 05 Apr 2018 16:06:40 +0000 ++ -- Raspbian forward porter Tue, 17 Apr 2018 04:15:49 +0000 ++ + qbs (1.11.0+dfsg-1) unstable; urgency=medium + + [ Alexander Volkov ] + * New upstream release. + * Drop fix_ftbfs_gcc6.diff, applied upstream. + * Update QBS_LIBEXEC_DESTDIR for static.pro and fix DESTDIR for + qbs_processlauncher (processlauncher_destdir.diff). + * Set LD_LIBRARY_PATH for qbsres target so it could use built qbs + to generate QML type descriptions (qml_type_descriptions.diff). + * Fix the list of installed headers for qmake build (installed_headers.diff). + * Update install files for the new release. + * Rename the library packages according to upstream SONAME change. + * Update symbols from build logs. + + -- Dmitry Shachnev Fri, 06 Apr 2018 17:36:51 +0300 qbs (1.10.1+dfsg-1) unstable; urgency=medium