From: Peter Michael Green Date: Thu, 5 Jan 2023 21:02:07 +0000 (+0000) Subject: Manual merge of version 4:21.12.3-1+rpi1 and 4:22.12.0-3 to produce 4:22.12.0-3+rpi1 X-Git-Tag: archive/raspbian/4%22.12.0-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=effa0ab38ac92fe43d4f81bbe02c359953d010bb;p=konqueror.git Manual merge of version 4:21.12.3-1+rpi1 and 4:22.12.0-3 to produce 4:22.12.0-3+rpi1 --- effa0ab38ac92fe43d4f81bbe02c359953d010bb diff --cc debian/changelog index 1d9ab4c,ebee5bf..26d6e12 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,47 +1,60 @@@ - konqueror (4:21.12.3-1+rpi1) bookworm-staging; urgency=medium ++konqueror (4:22.12.0-3+rpi1) bookworm-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 + + [changes introduced in 4:20.12.0-4+rpi1 by Peter Michael Green] + * Also remove armhf from architecture list for webengine specific plugins in debian/konq-plugins.install + - -- Raspbian forward porter Sun, 13 Mar 2022 14:03:00 +0000 ++ -- Peter Michael Green Thu, 05 Jan 2023 21:01:42 +0000 ++ + konqueror (4:22.12.0-3) unstable; urgency=medium + + * Team upload. + * Remove inactive Uploaders. + * CI: enable again blhc, as it works fine now with blhc 0.13. + * Modernize building: + - add the dh-sequence-kf5 build dependency to use the kf5 addon + automatically, removing pkg-kde-tools + - drop all the manually specified addons and buildsystem for dh + * Use execute_after_dh_auto_install to avoid invoking dh_auto_install + manually. + * Bump Standards-Version to 4.6.2, no changes required. + * Update the support for architectures without WebEngine: + - update optional-qtwebengine.diff for bits in the new version + - limit few more files & directories in konq-plugins.install, and + konqueror.install to the architectures on which WebEngine is available + * Enable the WebEngine support also on mips64el, as it is available there. + + -- Pino Toscano Sat, 17 Dec 2022 09:00:55 +0100 + + konqueror (4:22.12.0-2) unstable; urgency=medium + + * Upload with a correctly released changelog. + * Add Breaks/Replaces against kget (<< 4:22.12.0-1) for the kget + plugin translations. + + -- Aurélien COUDERC Sat, 10 Dec 2022 16:04:48 +0100 + + konqueror (4:22.12.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (22.08.3). + * Update build-deps and deps with the info from cmake. + * Bump Standards-Version to 4.6.1, no change required. + * Refresh patches. + * Update the list of installed files from build logs. + * New upstream release (22.11.90). + * Update build-deps and deps with the info from cmake. + * Update the list of installed files from build logs. + * New upstream release (22.12.0). + * Refresh lintian overrides. + * Refresh copyright information. + + -- Aurélien COUDERC Sat, 10 Dec 2022 00:13:01 +0100 konqueror (4:21.12.3-1) unstable; urgency=medium diff --cc debian/control index a733e67,8d044b3..2aac3dc --- a/debian/control +++ b/debian/control @@@ -37,12 -36,11 +36,11 @@@ Build-Depends: cmake (>= 3.5~) libqt5x11extras5-dev, libx11-dev, pkg-config, - pkg-kde-tools (>= 0.12), - qtbase5-dev (>= 5.12.0~), + qtbase5-dev (>= 5.15.2~), qtscript5-dev, - qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 i386 mipsel], - qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 armhf i386 mips64el mipsel], ++ qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 i386 mips64el mipsel], zlib1g-dev, - Standards-Version: 4.6.0 + Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://apps.kde.org/en/konqueror Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/konqueror diff --cc debian/konq-plugins.install index c891d26,9ad9ddb..a25f426 --- a/debian/konq-plugins.install +++ b/debian/konq-plugins.install @@@ -1,10 -1,13 +1,13 @@@ #!/usr/bin/dh-exec - [amd64 arm64 i386 mipsel] usr/bin/kcreatewebarchive - [amd64 arm64 i386 mipsel] usr/lib/*/qt5/plugins/webarchiverplugin.so - [amd64 arm64 i386 mipsel] usr/lib/*/qt5/plugins/webarchivethumbnail.so - [amd64 arm64 i386 mipsel] usr/share/config.kcfg/kcreatewebarchive.kcfg - [amd64 arm64 i386 mipsel] usr/share/icons/hicolor/*/actions/webarchiver.png - [amd64 arm64 i386 mipsel] usr/share/kservices5/webarchivethumbnail.desktop -[amd64 arm64 armhf i386 mips64el mipsel] usr/bin/kcreatewebarchive -[amd64 arm64 armhf i386 mips64el mipsel] usr/lib/*/qt5/plugins/khtml/kpartplugins/webarchiverpluginkhtml_kpartplugins.so -[amd64 arm64 armhf i386 mips64el mipsel] usr/lib/*/qt5/plugins/kwebkitpart/kpartplugins/webarchiverpluginkwebkitpart_kpartplugins.so -[amd64 arm64 armhf i386 mips64el mipsel] usr/lib/*/qt5/plugins/webarchiverplugin.so -[amd64 arm64 armhf i386 mips64el mipsel] usr/lib/*/qt5/plugins/webarchivethumbnail.so -[amd64 arm64 armhf i386 mips64el mipsel] usr/lib/*/qt5/plugins/webenginepart/kpartplugins/webarchiverpluginwebenginepart_kpartplugins.so -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/config.kcfg/kcreatewebarchive.kcfg -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/icons/hicolor/*/actions/webarchiver.png -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/kservices5/webarchivethumbnail.desktop ++[amd64 arm64 i386 mips64el mipsel] usr/bin/kcreatewebarchive ++[amd64 arm64 i386 mips64el mipsel] usr/lib/*/qt5/plugins/khtml/kpartplugins/webarchiverpluginkhtml_kpartplugins.so ++[amd64 arm64 i386 mips64el mipsel] usr/lib/*/qt5/plugins/kwebkitpart/kpartplugins/webarchiverpluginkwebkitpart_kpartplugins.so ++[amd64 arm64 i386 mips64el mipsel] usr/lib/*/qt5/plugins/webarchiverplugin.so ++[amd64 arm64 i386 mips64el mipsel] usr/lib/*/qt5/plugins/webarchivethumbnail.so ++[amd64 arm64 i386 mips64el mipsel] usr/lib/*/qt5/plugins/webenginepart/kpartplugins/webarchiverpluginwebenginepart_kpartplugins.so ++[amd64 arm64 i386 mips64el mipsel] usr/share/config.kcfg/kcreatewebarchive.kcfg ++[amd64 arm64 i386 mips64el mipsel] usr/share/icons/hicolor/*/actions/webarchiver.png ++[amd64 arm64 i386 mips64el mipsel] usr/share/kservices5/webarchivethumbnail.desktop etc/xdg/translaterc usr/bin/fsview usr/lib/*/qt5/plugins/akregatorkonqfeedicon.so diff --cc debian/konqueror.install index 9dce3c6,dee97fc..e64b650 --- a/debian/konqueror.install +++ b/debian/konqueror.install @@@ -1,10 -1,11 +1,11 @@@ #!/usr/bin/dh-exec - [amd64 arm64 i386 mipsel] usr/lib/*/libkwebenginepart.so - [amd64 arm64 i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so - [amd64 arm64 i386 mipsel] usr/share/icons/hicolor/*/apps/webengine.png - [amd64 arm64 i386 mipsel] usr/share/kconf_update/webenginepart.upd - [amd64 arm64 i386 mipsel] usr/share/kservices5/webenginepart.desktop - [amd64 arm64 i386 mipsel] usr/share/kxmlgui5/webenginepart/ -[amd64 arm64 armhf i386 mips64el mipsel] usr/lib/*/libkwebenginepart.so -[amd64 arm64 armhf i386 mips64el mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/icons/hicolor/*/apps/webengine.png -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/kconf_update/webenginepart.upd -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/kservices5/webenginepart.desktop -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/kxmlgui5/webenginepart/ -[amd64 arm64 armhf i386 mips64el mipsel] usr/share/webenginepart/ ++[amd64 arm64 i386 mips64el mipsel] usr/lib/*/libkwebenginepart.so ++[amd64 arm64 i386 mips64el mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so ++[amd64 arm64 i386 mips64el mipsel] usr/share/icons/hicolor/*/apps/webengine.png ++[amd64 arm64 i386 mips64el mipsel] usr/share/kconf_update/webenginepart.upd ++[amd64 arm64 i386 mips64el mipsel] usr/share/kservices5/webenginepart.desktop ++[amd64 arm64 i386 mips64el mipsel] usr/share/kxmlgui5/webenginepart/ ++[amd64 arm64 i386 mips64el mipsel] usr/share/webenginepart/ etc/xdg/autostart/konqy_preload.desktop etc/xdg/konqsidebartngrc usr/bin/kfmclient