From: Peter Michael Green Date: Sun, 25 Sep 2022 18:41:09 +0000 (+0000) Subject: Manual merge of version 5.97.0-1+rpi1 and 5.98.0-2 to produce 5.98.0-2+rpi1 X-Git-Tag: archive/raspbian/5.98.0-2+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc4d3118eebd957f5b5a0dfa14d0c650d70d6472;p=kdeclarative.git Manual merge of version 5.97.0-1+rpi1 and 5.98.0-2 to produce 5.98.0-2+rpi1 --- fc4d3118eebd957f5b5a0dfa14d0c650d70d6472 diff --cc debian/changelog index c260c71,7ab16f7..b454143 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,24 +1,37 @@@ - kdeclarative (5.97.0-1+rpi1) bookworm-staging; urgency=medium ++kdeclarative (5.98.0-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 5.12.0-2+rpi1 by Peter Michael Green at Sun, 19 Jul 2015 02:00:18 +0000] + * Add symbols file hack for raspbian. + + [changes introduced in version 5.27.0-1+rpi1 by Peter Michael Green] + * Disable testsuite. + + [changes introduced in version 5.96.0-3+rpi1 by Peter Michael Green] + * Extend symbols file hack. + - -- Raspbian forward porter Thu, 01 Sep 2022 23:07:34 +0000 ++ -- Peter Michael Green Sun, 25 Sep 2022 18:40:25 +0000 ++ + kdeclarative (5.98.0-2) unstable; urgency=medium + + * Team upload. + * Update symbols files from the logs of buildds. + * Modernize the building more: + - add the dh-sequence-pkgkde-symbolshelper build dependency to use the + pkgkde_symbolshelper automatically + - drop the manually specified pkgkde_symbolshelper addon for dh + * Tighten the inter-library dependencies. + + -- Pino Toscano Wed, 21 Sep 2022 01:03:29 +0200 + + kdeclarative (5.98.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.98.0). + * Update build-deps and deps with the info from cmake. + * Update symbols from build for 5.98.0. + * Review copyright information. + + -- Aurélien COUDERC Sun, 18 Sep 2022 23:11:49 +0200 kdeclarative (5.97.0-1) unstable; urgency=medium diff --cc debian/rules index a1407c5,8c2c2ef..84b7947 --- a/debian/rules +++ b/debian/rules @@@ -3,21 -3,17 +3,27 @@@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=-fixfilepath + libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages) + include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk + %: - dh $@ --with pkgkde_symbolshelper + dh $@ +override_dh_auto_build: + sed -i s/arch=!armel/optional=meh/ debian/libkf5declarative5.symbols + sed -i 's/arch=alpha amd64 arm64 armhf hppa i386 mips64el mipsel powerpc ppc64 ppc64el s390x sh4/optional=meh2/' debian/libkf5declarative5.symbols + dh_auto_build + +override_dh_auto_clean: + dh_auto_clean + sed -i s/optional=meh/arch=!armel/ debian/libkf5declarative5.symbols + sed -i 's/optional=meh2/arch=alpha amd64 arm64 armhf hppa i386 mips64el mipsel powerpc ppc64 ppc64el s390x sh4/' debian/libkf5declarative5.symbols + override_dh_auto_configure: dh_auto_configure -- -DBUILD_QCH=ON override_dh_auto_test: - xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test --no-parallel + #xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test --no-parallel + + override_dh_gencontrol-arch: libpkgs_gen_strict_local_shlibs + dh_gencontrol -a