From: Peter Michael Green Date: Tue, 9 Aug 2022 16:39:51 +0000 (+0000) Subject: Manual merge of version 5.94.0-1+rpi1 and 5.96.0-2 to produce 5.96.0-2+rpi1 X-Git-Tag: archive/raspbian/5.96.0-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4244e2c6209b3c4c443b339ace01edc5d3f84de0;p=kirigami2.git Manual merge of version 5.94.0-1+rpi1 and 5.96.0-2 to produce 5.96.0-2+rpi1 --- f319c57d476fee9f800283f79a1ab9b996c55e74 diff --cc debian/changelog index 50c6695,49ea326..cb53970 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,28 +1,35 @@@ - kirigami2 (5.94.0-1+rpi1) bookworm-staging; urgency=medium ++kirigami2 (5.96.0-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 5.83.0-3+rpi1 by root at Sun, 29 Aug 2021 23:05:08 +0000] + * Update symbols file for raspbian. + - -- Raspbian forward porter Mon, 13 Jun 2022 06:28:04 +0000 ++ -- Peter Michael Green Tue, 09 Aug 2022 16:36:52 +0000 ++ + kirigami2 (5.96.0-2) unstable; urgency=medium + + * Team upload. + * Remove inactive Uploaders. + * Modernize building: + - add the dh-sequence-kf5 build dependency to use the kf5 addon + automatically + - drop all the manually specified addons and buildsystem for dh + * CI: enable again the blhc job. + * Remove the unused ${shlibs:Depends} substvar from kirigami2-dev. + * The Breeze icon theme does not seem to be required at build time anymore, + so: + - drop the breeze-icon-theme build dependency + - stop passing -DBREEZEICONS_DIR=/usr/share/icons/breeze to cmake + * Update symbols file. + + -- Pino Toscano Mon, 01 Aug 2022 08:36:30 +0200 + + kirigami2 (5.96.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.96.0). + * Bump Standards-Version to 4.6.1, no change required. + + -- Aurélien COUDERC Sun, 31 Jul 2022 13:33:06 +0200 kirigami2 (5.94.0-1) unstable; urgency=medium diff --cc debian/rules index 4d639a3,a21a70a..594f2bb --- a/debian/rules +++ b/debian/rules @@@ -3,16 -3,11 +3,16 @@@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp + dh $@ --with pkgkde_symbolshelper override_dh_auto_configure: + sed -i 's/(arch=!armel !riscv64)/(optional=notarmelandprobabllynotraspbian)/' debian/libkf5kirigami2-5.symbols - dh_auto_configure -- -DBUILD_QCH=ON -DBREEZEICONS_DIR=/usr/share/icons/breeze + dh_auto_configure -- -DBUILD_QCH=ON +override_dh_auto_clean: + dh_auto_clean + sed -i 's/(optional=notarmelandprobabllynotraspbian)/(arch=!armel !riscv64)/' debian/libkf5kirigami2-5.symbols + override_dh_auto_test: # Disable unittest at build time, they require the runtime # dependencies and the modules installed. Move the tests to