From: Peter Michael Green Date: Thu, 7 Jan 2021 21:47:44 +0000 (+0000) Subject: Manual merge of version 4:20.08.3-1+rpi1 and 4:20.12.0-4 to produce 4:20.12.0-4+rpi1 X-Git-Tag: archive/raspbian/4%20.12.0-4+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=511f62489a37dec7a272840dd54cecbcefc7449e;p=konqueror.git Manual merge of version 4:20.08.3-1+rpi1 and 4:20.12.0-4 to produce 4:20.12.0-4+rpi1 --- 511f62489a37dec7a272840dd54cecbcefc7449e diff --cc debian/changelog index 1ebd3e3,852f5a9..549e90a --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,46 +1,56 @@@ - konqueror (4:20.08.3-1+rpi1) bullseye-staging; urgency=medium ++konqueror (4:20.12.0-4+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 Michael Green Thu, 19 Nov 2020 14:08:55 +0000 ++ -- Peter Michael Green Thu, 07 Jan 2021 16:44:11 +0000 ++ + konqueror (4:20.12.0-4) unstable; urgency=medium + + * usr/share/kconf_update/webenginepart.upd is built only on architectures + with QtWebEngine and should be installed conditionally. + + -- Aurélien COUDERC Wed, 30 Dec 2020 20:28:27 +0100 + + konqueror (4:20.12.0-3) unstable; urgency=medium + + [ Norbert Preining ] + * Add myself to uploaders. + * Fix FTBFS when qtwebengine is not available. + + -- Aurélien COUDERC Wed, 30 Dec 2020 12:52:18 +0100 + + konqueror (4:20.12.0-2) unstable; urgency=medium + + * Add missing build dependencies: + - libkf5notifications-dev + + -- Aurélien COUDERC Tue, 29 Dec 2020 19:29:42 +0100 + + konqueror (4:20.12.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * Rewrite copyright file. + * Drop l10n migration rules, not required anymore after 2 stable releases. + * Build with hardening=+all build hardening flag. + * Refresh upstream metadata, add Bug-Database and Bug-Submit. + * New upstream release (20.12.0). + * Refresh patch for making the use of QtWebEngine optional. + * Update build dependencies according to the upstream build system: + - add libkf5guiaddons-dev + - drop libkf5kdelibs4support-dev + * Update installed files for new webarchive plugin. + * Bump Standards-Version to 4.5.1, no change required. + * Refresh upstream metadata. + * Update project homepage. + * Removed Eshat Cakar, George Kiagiadakis, Maximiliano Curia, Modestas + Vainius from the uploaders, thanks for your work on the package! + * Added myself to the uploaders. + + -- Aurélien COUDERC Tue, 29 Dec 2020 18:38:15 +0100 konqueror (4:20.08.3-1) unstable; urgency=medium diff --cc debian/control index 3c8ac82,309a8b2..db694ad --- a/debian/control +++ b/debian/control @@@ -35,11 -34,11 +34,11 @@@ Build-Depends: cmake (>= 3.0~) pkg-kde-tools (>= 0.12), qtbase5-dev (>= 5.12.0~), qtscript5-dev, - qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 armhf i386 mipsel], + qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 i386 mipsel], zlib1g-dev, - Standards-Version: 4.5.0 + Standards-Version: 4.5.1 Rules-Requires-Root: no - Homepage: https://www.kde.org/ + Homepage: https://apps.kde.org/en/konqueror 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 2a70cf3,91aea9d..9292472 --- a/debian/konqueror.install +++ b/debian/konqueror.install @@@ -1,9 -1,10 +1,10 @@@ #!/usr/bin/dh-exec -[amd64 arm64 armhf i386 mipsel] usr/lib/*/libkwebenginepart.so -[amd64 arm64 armhf i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so -[amd64 arm64 armhf i386 mipsel] usr/share/icons/hicolor/*/apps/webengine.png -[amd64 arm64 armhf i386 mipsel] usr/share/kconf_update/webenginepart.upd -[amd64 arm64 armhf i386 mipsel] usr/share/kservices5/webenginepart.desktop -[amd64 arm64 armhf i386 mipsel] usr/share/kxmlgui5/webenginepart/ +[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 i386 mipsel] usr/share/kxmlgui5/webenginepart/ etc/xdg/autostart/konqy_preload.desktop etc/xdg/konqsidebartngrc usr/bin/kfmclient