diff -Nru konqueror-18.12.0/debian/changelog konqueror-18.12.0/debian/changelog --- konqueror-18.12.0/debian/changelog 2018-12-26 15:51:23.000000000 +0000 +++ konqueror-18.12.0/debian/changelog 2019-01-01 20:10:24.000000000 +0000 @@ -1,3 +1,13 @@ +konqueror (4:18.12.0-1+rpi1) buster-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 Michael Green Tue, 01 Jan 2019 20:10:24 +0000 + konqueror (4:18.12.0-1) unstable; urgency=medium * Team upload. diff -Nru konqueror-18.12.0/debian/control konqueror-18.12.0/debian/control --- konqueror-18.12.0/debian/control 2018-12-26 15:08:44.000000000 +0000 +++ konqueror-18.12.0/debian/control 2019-01-01 20:10:24.000000000 +0000 @@ -33,7 +33,7 @@ pkg-kde-tools (>= 0.12), qtbase5-dev (>= 5.5.0~), qtscript5-dev, - qtwebengine5-dev (>= 5.5.0~) [amd64 arm64 armhf i386 mipsel], + qtwebengine5-dev (>= 5.5.0~) [amd64 arm64 i386 mipsel], zlib1g-dev, Standards-Version: 4.3.0 Homepage: http://www.kde.org/ diff -Nru konqueror-18.12.0/debian/konqueror.install konqueror-18.12.0/debian/konqueror.install --- konqueror-18.12.0/debian/konqueror.install 2018-12-26 15:23:20.000000000 +0000 +++ konqueror-18.12.0/debian/konqueror.install 2019-01-01 20:10:24.000000000 +0000 @@ -6,12 +6,12 @@ usr/lib/*/libkdeinit5_kfmclient.so usr/lib/*/libkdeinit5_konqueror.so usr/lib/*/libkonquerorprivate.so.* -[amd64 arm64 armhf i386 mipsel] usr/lib/*/libkwebenginepartlib.so +[amd64 arm64 i386 mipsel] usr/lib/*/libkwebenginepartlib.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/lib/*/qt5/plugins/konq_aboutpage.so usr/share/applications/kfmclient.desktop usr/share/applications/kfmclient_*.desktop @@ -21,7 +21,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/ @@ -30,10 +30,10 @@ 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 @@ -42,4 +42,4 @@ usr/share/locale/*/LC_MESSAGES/konqueror.mo usr/share/locale/*/LC_MESSAGES/webenginepart.mo usr/share/metainfo/org.kde.konqueror.appdata.xml -[amd64 arm64 armhf i386 mipsel] usr/share/webenginepart/ +[amd64 arm64 i386 mipsel] usr/share/webenginepart/