diff -Nru konqueror-20.04.3/debian/changelog konqueror-20.04.3/debian/changelog --- konqueror-20.04.3/debian/changelog 2020-08-28 08:50:34.000000000 +0000 +++ konqueror-20.04.3/debian/changelog 2020-09-02 11:17:44.000000000 +0000 @@ -1,3 +1,13 @@ +konqueror (4:20.04.3-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 + + -- Raspbian forward porter Wed, 02 Sep 2020 11:17:44 +0000 + konqueror (4:20.04.3-1) unstable; urgency=medium * Team upload. diff -Nru konqueror-20.04.3/debian/control konqueror-20.04.3/debian/control --- konqueror-20.04.3/debian/control 2020-08-28 08:34:29.000000000 +0000 +++ konqueror-20.04.3/debian/control 2020-09-02 11:17:44.000000000 +0000 @@ -35,7 +35,7 @@ pkg-kde-tools (>= 0.12), qtbase5-dev (>= 5.9.0~), qtscript5-dev, - qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 armhf i386 mipsel], + qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel], zlib1g-dev, Standards-Version: 4.5.0 Rules-Requires-Root: no diff -Nru konqueror-20.04.3/debian/konqueror.install konqueror-20.04.3/debian/konqueror.install --- konqueror-20.04.3/debian/konqueror.install 2020-05-02 14:21:58.000000000 +0000 +++ konqueror-20.04.3/debian/konqueror.install 2020-09-02 11:17:44.000000000 +0000 @@ -5,12 +5,12 @@ usr/lib/*/libkdeinit5_kfmclient.so usr/lib/*/libkdeinit5_konqueror.so usr/lib/*/libkonquerorprivate.so.* -[amd64 arm64 armhf i386 mipsel] usr/lib/*/libkwebenginepart.so +[amd64 arm64 i386 mipsel] usr/lib/*/libkwebenginepart.so usr/lib/*/qt5/plugins/kcm_bookmarks.so 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/share/applications/kfmclient.desktop usr/share/applications/kfmclient_*.desktop usr/share/applications/konqbrowser.desktop @@ -19,7 +19,7 @@ usr/share/doc/HTML/*/kcontrol5/ usr/share/doc/HTML/*/konqueror/ usr/share/icons/hicolor/*/apps/konqueror.png -[amd64 arm64 armhf i386 mipsel] usr/share/icons/hicolor/*/apps/webengine.png +[amd64 arm64 i386 mipsel] usr/share/icons/hicolor/*/apps/webengine.png usr/share/kcmcss/ usr/share/kcontrol/pics/*png usr/share/konqueror/ @@ -27,9 +27,9 @@ usr/share/kservices5/kcmkonqyperformance.desktop usr/share/kservices5/kcmperformance.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/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