From: Raspbian automatic forward porter Date: Sat, 25 Feb 2023 19:19:44 +0000 (+0000) Subject: Merge version 5.102.0-1+rpi1 and 5.103.0-2 to produce 5.103.0-2+rpi1 X-Git-Tag: archive/raspbian/5.103.0-2+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2a39a5bea1c9bee72c4722143dfcd851583e1ae7;p=ksyntax-highlighting.git Merge version 5.102.0-1+rpi1 and 5.103.0-2 to produce 5.103.0-2+rpi1 --- 2a39a5bea1c9bee72c4722143dfcd851583e1ae7 diff --cc debian/changelog index 30aef02,baa2bdc..72edd70 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,29 +1,36 @@@ - ksyntax-highlighting (5.102.0-1+rpi1) bookworm-staging; urgency=medium ++ksyntax-highlighting (5.103.0-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 5.62.0-3+rpi1 by Peter Michael Green at Tue, 25 Feb 2020 04:12:28 +0000] + * Add symbols file hack for raspbian. + - -- Raspbian forward porter Mon, 30 Jan 2023 04:03:01 +0000 ++ -- Raspbian forward porter Sat, 25 Feb 2023 19:19:44 +0000 ++ + ksyntax-highlighting (5.103.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 + - add the dh-sequence-pkgkde-symbolshelper build dependency to use the + pkgkde_symbolshelper automatically + - drop the pkg-kde-tools build dependency, no more explicitly needed + - drop all the manually specified addons and buildsystem for dh + * Remove breaks/replaces for existing packages with versions older than + oldstable. + * Make sure to link with atomic on architectures that need it, i.e. + armel m68k mipsel sh4. + * Update symbols files from the logs of buildds. + + -- Pino Toscano Tue, 14 Feb 2023 08:36:41 +0100 + + ksyntax-highlighting (5.103.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.103.0). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Sun, 12 Feb 2023 21:44:25 +0100 ksyntax-highlighting (5.102.0-1) unstable; urgency=medium diff --cc debian/rules index 8ecf935,d7aa2ea..4e4bc49 --- a/debian/rules +++ b/debian/rules @@@ -3,13 -3,13 +3,18 @@@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all + archs_that_need_atomic = armel m68k mipsel sh4 + ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic))) + export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed + endif + %: - dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp + dh $@ override_dh_auto_configure: + sed -i 's/(arch=!armel !riscv64)/(optional=notarmelandprobabllynotraspbian)/' debian/libkf5syntaxhighlighting5.symbols dh_auto_configure -- -DBUILD_QCH=ON -DKF5_HOST_TOOLING=/usr/lib + +override_dh_auto_clean: + dh_auto_clean + sed -i 's/(optional=notarmelandprobabllynotraspbian)/(arch=!armel !riscv64)/' debian/libkf5syntaxhighlighting5.symbols