From: Peter Michael Green Date: Tue, 12 May 2020 10:20:17 +0000 (+0000) Subject: Manual merge of version 4:19.08.2-2+rpi1 and 4:20.04.0-1 to produce 4:20.04.0-1+rpi1 X-Git-Tag: archive/raspbian/4%20.04.0-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c3322cf3a077ee1b705275c8e2f230e47f0a3bf3;p=konqueror.git Manual merge of version 4:19.08.2-2+rpi1 and 4:20.04.0-1 to produce 4:20.04.0-1+rpi1 --- c3322cf3a077ee1b705275c8e2f230e47f0a3bf3 diff --cc debian/changelog index a6fac84,871d10b..89e79d4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,34 +1,44 @@@ - konqueror (4:19.08.2-2+rpi1) bullseye-staging; urgency=medium ++konqueror (4:20.04.0-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green at Sun, 07 Jan 2018 14:14:20 +0000] + * Remove armhf from webengine arches since raspbian doesn't currently have it. + + [changes introduced in 4:18.12.0-1+rpi1 by Peter Michal Green] + * Also remove armhf from architecture list for webengine directory in debian/konqueror.install + - -- Peter Micheal Green Thu, 31 Oct 2019 19:28:33 +0000 ++ -- Peter Michael Green Tue, 12 May 2020 10:19:40 +0000 ++ + konqueror (4:20.04.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Update watch file to the new release-service location. + * Update the build dependencies according to the upstream build system: + - bump cmake to 3.0 + - bump the Qt packages to 5.9.0 + - bump the KF packages to 5.38.0 + - add libkf5dbusaddons-dev, libkf5jobwidgets-dev, libkf5windowsystem-dev, + and libqt5texttospeech5-dev + - remove libkf5khtml-dev, libkf5widgetsaddons-dev, and libtidy-dev, + no more used + * Switch from dhmk to the dh sequencer: + - invoke the dh sequencer using the kf5 addon + - call the right debhelper command instead of $(overridden_command) + - manually force the generation of the substvars for the kde-l10n breaks + * Bump the debhelper compatibility to 12: + - switch the debhelper build dependency to debhelper-compat 12 + - remove debian/compat + - switch from dh_install to dh_missing for --fail-missing + * Bump Standards-Version to 4.5.0, no changes required. + * Update the patches: + - upstream_Fix-CMakeLists.txt-to-compile-WebEnginePartHtmlEmbed.patch: + drop, backported from upstream + - optional-qtwebengine.diff: update + * Restore compatibility with KBookmarkMenu < 5.69; patch + old-kbookmarkmenu.diff. + * Update install files. + + -- Pino Toscano Sat, 02 May 2020 16:48:06 +0200 konqueror (4:19.08.2-2) unstable; urgency=medium diff --cc debian/control index a225197,c116ed3..7b767e8 --- a/debian/control +++ b/debian/control @@@ -31,12 -33,11 +33,11 @@@ Build-Depends: cmake (>= 3.0~) libx11-dev, pkg-config, pkg-kde-tools (>= 0.12), - qtbase5-dev (>= 5.5.0~), + qtbase5-dev (>= 5.9.0~), qtscript5-dev, - qtwebengine5-dev (>= 5.5.0~) [amd64 arm64 i386 mipsel], - qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 armhf i386 mipsel], ++ qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel], zlib1g-dev, - Standards-Version: 4.4.1 + Standards-Version: 4.5.0 Homepage: http://www.kde.org/ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/konqueror Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/konqueror.git diff --cc debian/konqueror.install index 32a0e61,b035093..8bb7f42 --- a/debian/konqueror.install +++ b/debian/konqueror.install @@@ -10,8 -10,7 +10,7 @@@ usr/lib/*/qt5/plugins/kcm_bookmarks.s usr/lib/*/qt5/plugins/kcm_konq.so usr/lib/*/qt5/plugins/kcm_konqhtml.so usr/lib/*/qt5/plugins/kcm_performance.so -[amd64 arm64 armhf i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so +[amd64 arm64 i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so - usr/lib/*/qt5/plugins/konq_aboutpage.so usr/share/applications/kfmclient.desktop usr/share/applications/kfmclient_*.desktop usr/share/applications/konqbrowser.desktop @@@ -27,12 -26,10 +26,10 @@@ usr/share/konqueror usr/share/kservices5/bookmarks.desktop usr/share/kservices5/kcmkonqyperformance.desktop usr/share/kservices5/kcmperformance.desktop - usr/share/kservices5/konq_aboutpage.desktop usr/share/kservices5/org.kde.konqueror.desktop -[amd64 arm64 armhf i386 mipsel] usr/share/kservices5/webenginepart.desktop +[amd64 arm64 i386 mipsel] usr/share/kservices5/webenginepart.desktop - usr/share/kservicetypes5/konqaboutpage.desktop usr/share/kwebkitpart/ -[amd64 arm64 armhf i386 mipsel] usr/share/kxmlgui5/webenginepart/ +[amd64 arm64 i386 mipsel] usr/share/kxmlgui5/webenginepart/ usr/share/locale/*/LC_MESSAGES/kcmbookmarks.mo usr/share/locale/*/LC_MESSAGES/kcmkonq.mo usr/share/locale/*/LC_MESSAGES/kcmkonqhtml.mo