From: Pino Toscano Date: Fri, 13 Nov 2020 11:28:28 +0000 (+0000) Subject: Import konqueror_20.08.3-1.debian.tar.xz X-Git-Tag: archive/raspbian/4%20.08.3-1+rpi1^2~2^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=12f50b3a83f05b0dea6381058ae18f3c37cedd14;p=konqueror.git Import konqueror_20.08.3-1.debian.tar.xz [dgit import tarball konqueror 4:20.08.3-1 konqueror_20.08.3-1.debian.tar.xz] --- 12f50b3a83f05b0dea6381058ae18f3c37cedd14 diff --git a/changelog b/changelog new file mode 100644 index 0000000..4f2cf4a --- /dev/null +++ b/changelog @@ -0,0 +1,250 @@ +konqueror (4:20.08.3-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Use secure URI in Homepage field. + * Re-export upstream signing key without extra signatures. + * Set field Upstream-Contact in debian/copyright. + * Remove obsolete fields Contact, Name from debian/upstream/metadata (already + present in machine-readable debian/copyright). + * Update the build dependencies according to the upstream build system: + - bump the Qt packages to 5.12.0 + - bump the KF packages to 5.71.0 + * Update the patches: + - optional-qtwebengine.diff: refresh + * Update install files. + * Do not ship the development files for konqsidebarplugin, for now. + * Update lintian overrides. + * Drop the kfmclient, and konqueror, as they are largely outdated. + (Closes: #579870) + + -- Pino Toscano Fri, 13 Nov 2020 12:28:28 +0100 + +konqueror (4:20.04.3-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Update the patches: + - old-kbookmarkmenu.diff: drop, no more needed + * Really unregister the old /etc/xdg/konqueror.categories conffile; + drop the misspelt konqeror.maintscript file. + * Bump the debhelper compatibility to 13: + - switch the debhelper-compat build dependency to 13 + - stop passing --fail-missing to dh_missing, as it is the default now + * Add Rules-Requires-Root: no. + * Update lintian overrides. + + -- Pino Toscano Fri, 28 Aug 2020 10:50:34 +0200 + +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 + + * Team upload. + * Ship /usr/share/webenginepart/ on all the architectures, not only where + QtWebEngine is available, as there is content installed no matter the + architecture. + + -- Pino Toscano Sat, 12 Oct 2019 20:26:50 +0200 + +konqueror (4:19.08.2-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Bump Standards-Version to 4.4.1, no changes required. + * Add the configuration for the CI on salsa. + * Update the build dependencies according to the upstream build system: + - bump cmake to 3.0 + - bump the KF packages to 5.31.0 + - explicitly add gettext + * Drop the migration from kde-baseapps-dbg, no more needed after two + Debian stable releases. + * Pass -DBUILD_TESTING=OFF to cmake to disable the build of tests, as they + are not run at build time anyway. + * Drop the 'testsuite' autopkgtest, as it does not test the installed + packages. + * Update the patches: + - optional-qtwebengine.diff: refresh/update + * Backport upstream commit 9119e90c00ebe75bd41223eee9b06cda99181a0c to build + also with QtWebEngine < 5.12.0; patch + upstream_Fix-CMakeLists.txt-to-compile-WebEnginePartHtmlEmbed.patch. + * Update install files. + * Unregister akregatorplugin.categories, and konqueror.categories as + conffile, as they are no more in /etc. + * Update lintian overrides. + * Drop unused, and uninstalled keditbookmarks man page. + + -- Pino Toscano Sat, 12 Oct 2019 17:36:32 +0200 + +konqueror (4:18.12.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Bump Standards-Version to 4.3.0, no changes required. + * Update install files. + + -- Pino Toscano Wed, 26 Dec 2018 16:51:23 +0100 + +konqueror (4:18.04.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Add the newly required libkf5wallet-dev build dependency. + * Switch Vcs-* fields to salsa.debian.org. + * Bump the debhelper compatibility to 11: + - bump the debhelper build dependency to 11~ + - bump compat to 11 + * Bump Standards-Version to 4.1.4, no changes required. + * Mark libkf5konq-dev, and libkf5konq6 as Multi-Arch: same. + * Slightly reword the description of patch optional-qtwebengine.diff. + * Use https for Format in copyright. + + -- Pino Toscano Sun, 22 Apr 2018 10:08:37 +0200 + +konqueror (4:17.08.3-2) unstable; urgency=medium + + * Team upload. + * Upload to unstable. + * Bump Standards-Version to 4.1.3, no changes required. + * Adjust l10npkgs_firstversion_ok to the version where kde-l10n will + drop translations. + + -- Pino Toscano Thu, 28 Dec 2017 13:03:23 +0100 + +konqueror (4:17.08.3-1) experimental; urgency=medium + + * Team upload. + + [ Maximiliano Curia ] + * Update uploaders list as requested by MIA team + + [ Pino Toscano ] + * New upstream release. + * Bump Standards-Version to 4.1.2, no changes required. + * Simplify watch file, and switch it to https. + * Remove trailing whitespaces in changelog. + * Remove the unused kded5-dev build dependency. + * Remove the libqt5webengine5-dev alternative build dependency for + qtwebengine5-dev. + * Remove the extra kde-l10n-ast, and kde-l10n-eo breaks/replaces, as already + included in ${kde-l10n:all}. + * Add back the konq-plugins suggest in konqueror. + * Make konqueror buildable also without QtWebEngine: + - build the code using it conditionally; patch optional-qtwebengine.diff + - add the dh-exec build dependency + - restrict the webengine-related files on architectures with QtWebEngine + - restrict the qtwebengine5-dev build dependency on the architectures + where it is available: amd64 arm64 armhf i386 mipsel. + * Invoke dh_install with --fail-missing, so there is no risk of forgetting + files. + * Simplify the install files. + + -- Pino Toscano Fri, 15 Dec 2017 19:10:25 +0100 + +konqueror (4:17.08.1-1) experimental; urgency=medium + + * New upstream release (17.08.1) + * Update Vcs fields + * Bump Standards-Version to 4.1.0. + * Update upstream metadata + * Update build-deps and deps with the info from cmake + * Add a .gitattributes file to use dpkg-mergechangelogs + * Release to experimental + + -- Maximiliano Curia Mon, 11 Sep 2017 14:03:23 +0200 + +konqueror (4:17.08.1-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Tue, 05 Sep 2017 14:01:53 +0000 + +konqueror (4:17.08.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Thu, 17 Aug 2017 09:39:16 +0000 + +konqueror (4:17.04.3-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Wed, 12 Jul 2017 10:22:56 +0000 + +konqueror (4:17.04.2-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Wed, 07 Jun 2017 12:22:55 +0000 + +konqueror (4:17.04.1-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Thu, 11 May 2017 18:22:46 +0000 + +konqueror (4:17.04.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Wed, 19 Apr 2017 13:05:34 +0000 + +konqueror (4:16.12.3-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Wed, 08 Mar 2017 13:49:18 +0000 + +konqueror (4:16.12.2-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Wed, 08 Feb 2017 17:00:36 +0000 + +konqueror (4:16.12.1-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Wed, 11 Jan 2017 13:21:05 +0000 + +konqueror (4:16.12.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Thu, 15 Dec 2016 19:31:07 +0000 + +konqueror (4:16.11.90-0neon) xenial; urgency=medium + + * Initial release. + + -- Raymond Wooninck Mon, 07 Nov 2016 18:50:18 +0100 diff --git a/control b/control new file mode 100644 index 0000000..94dc147 --- /dev/null +++ b/control @@ -0,0 +1,132 @@ +Source: konqueror +Section: kde +Priority: optional +Maintainer: Debian/Kubuntu Qt/KDE Maintainers +Uploaders: Sune Vuorela , + Modestas Vainius , + George Kiagiadakis , + Eshat Cakar , + Maximiliano Curia , +Build-Depends: cmake (>= 3.0~), + debhelper-compat (= 13), + dh-exec, + extra-cmake-modules (>= 5.71.0~), + gettext, + kinit-dev (>= 5.71.0~), + libkf5activities-dev (>= 5.71.0~), + libkf5archive-dev (>= 5.71.0~), + libkf5bookmarks-dev, + libkf5crash-dev (>= 5.71.0~), + libkf5dbusaddons-dev (>= 5.71.0~), + libkf5doctools-dev (>= 5.71.0~), + libkf5iconthemes-dev (>= 5.71.0~), + libkf5jobwidgets-dev, + libkf5kcmutils-dev (>= 5.71.0~), + libkf5kdelibs4support-dev (>= 5.71.0~), + libkf5kio-dev (>= 5.37.0~), + libkf5parts-dev (>= 5.71.0~), + libkf5su-dev, + libkf5wallet-dev (>= 5.71.0~), + libkf5windowsystem-dev (>= 5.71.0~), + libqt5texttospeech5-dev (>= 5.12.0~), + libqt5x11extras5-dev, + libx11-dev, + pkg-config, + pkg-kde-tools (>= 0.12), + qtbase5-dev (>= 5.12.0~), + qtscript5-dev, + qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 armhf i386 mipsel], + zlib1g-dev, +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Homepage: https://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 + +Package: konq-plugins +Architecture: any +Depends: konqueror (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Enhances: konqueror +Breaks: ${kde-l10n:all}, +Replaces: ${kde-l10n:all}, +Recommends: imagemagick +Description: plugins for Konqueror, the KDE file/web/document browser + This package contains a variety of useful plugins for Konqueror, the + file manager, web browser and document viewer for KDE. Many of these + plugins will appear in Konqueror's Tools menu. + . + Web navigation plugins: + - Akregator feed icon: allows one to add a feed to Akregator from Konqueror + - Auto Refresh: refresh a webpage at a given rate + - Bookmarklets: enables the use of bookmarklets, bookmarks containing + JavaScript code + - Document Relations: displays the document relations of a document + - DOM Tree Viewer: view the DOM tree of the current page + - KHTML Settings: fast way to change the JavaScript/images/cookies settings + - Microformat Icon: displays an icon in the statusbar if the page contains + a microformat + - Search Bar: launches web searches from the Konqueror's toolbar + - Translate: language translation for the current page using Babelfish + - UserAgent Changer: quick switch of the UserAgent used for the current site + - Website Validators: CSS and HTML validation tools + - Web Archiver: creates archives of websites + - Crash manager: restores your opened tabs if Konqueror crashes (disabled + by default as Konqueror has this feature builtin) + . + File management plugins: + - Image Gallery: an easy way to generate a HTML image gallery + - File Size View (kpart): a proportional view of directories and files + based on file size + - Transform Image (service menu): rotate and flip images + - Convert To (service menu): convert and image to another format + - Directory Filter (dolphin): filter directory views + . + This package is part of the KDE base applications module. + +Package: konqueror +Section: web +Architecture: any +Provides: info-browser, man-browser, www-browser +Depends: dolphin, install-info, ${misc:Depends}, ${shlibs:Depends} +Recommends: kfind +Suggests: konq-plugins +Breaks: ${kde-l10n:all}, +Replaces: ${kde-l10n:all}, +Description: advanced file manager, web browser and document viewer + Konqueror is the KDE web browser and advanced file manager. + . + Konqueror is a standards-compliant web browser, supporting HTML 4.01, Java, + JavaScript, CSS3, and Netscape plugins such as Flash. + . + It supports advanced file management on local UNIX filesystems, with flexible + views, network transparency, and embedded file viewing. + . + It is the canvas for many KDE technologies, from remote file access via KIO to + component embedding via the KParts object interface, making it one of the most + customizable applications available. + . + This package is part of the KDE base applications module. + +Package: libkf5konq-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libkf5konq6 (= ${binary:Version}), libkf5xmlgui-dev, ${misc:Depends} +Description: development files for the Konqueror libraries + This package contains development files for building software that uses the + Konqueror libraries. + . + This package is part of the KDE base applications module. + +Package: libkf5konq6 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: ${kde-l10n:all}, +Replaces: ${kde-l10n:all}, +Description: core libraries for Konqueror + This package contains libraries used by several KDE 4 applications, + particularly Konqueror. + . + This package is part of the KDE base applications module. diff --git a/copyright b/copyright new file mode 100644 index 0000000..8d85df8 --- /dev/null +++ b/copyright @@ -0,0 +1,60 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: konqueror +Source: http://download.kde.org +Upstream-Contact: kde-devel@kde.org + +Files: * +Copyright: (C) 1996-2016 Started by Torben Weis + (C) 1996-2016 David Faure + (C) 1996-2016 Simon Hausmann + (C) 1996-2016 Matthias Welk + (C) 1996-2016 Michael Reiher + (C) 1996-2016 Alexander Neundorf (List views) + (C) 1996-2016 Michael Brade (List Views, I/O lib) + (C) 1996-2016 Lars Knoll (HTML rendering engine) + (C) 1996-2016 Antti Koivisto (HTML rendering engine) + (C) 1996-2016 Waldo Bastian (HTML rendering engine) + (C) 1996-2016 Matt Koss (I/O lib) + (C) 1996-2016 Stephan Kulow (I/O lib) + (C) 1996-2016 Richard Moore (Java applet support) +License: GPL-2+ + +Files: debian/* +Copyright: (C) 2016 Raymond Wooninck +License: GPL-2+ + +Files: webenginepart/* +Copyright: (C) 2009 Dawit Alemayehu +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version. + . + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/konq-plugins.install b/konq-plugins.install new file mode 100644 index 0000000..1306d7e --- /dev/null +++ b/konq-plugins.install @@ -0,0 +1,39 @@ +etc/xdg/translaterc +usr/bin/fsview +usr/lib/*/qt5/plugins/akregatorkonqfeedicon.so +usr/lib/*/qt5/plugins/autorefresh.so +usr/lib/*/qt5/plugins/babelfishplugin.so +usr/lib/*/qt5/plugins/dirfilterplugin.so +usr/lib/*/qt5/plugins/fsviewpart.so +usr/lib/*/qt5/plugins/kf5/kfileitemaction/akregatorplugin.so +usr/lib/*/qt5/plugins/khtmlsettingsplugin.so +usr/lib/*/qt5/plugins/khtmlttsplugin.so +usr/lib/*/qt5/plugins/kimgallery.so +usr/lib/*/qt5/plugins/konq_shellcmdplugin.so +usr/lib/*/qt5/plugins/searchbarplugin.so +usr/lib/*/qt5/plugins/uachangerplugin.so +usr/share/akregator/pics/feed.png +usr/share/dolphinpart/ +usr/share/icons/hicolor/*/actions/babelfish.png +usr/share/icons/hicolor/*/actions/imagegallery.png +usr/share/icons/hicolor/*/apps/fsview.png +usr/share/kf5/kbookmark/directory_bookmarkbar.desktop +usr/share/khtml/ +usr/share/kservices5/akregator_konqplugin.desktop +usr/share/kservices5/filebehavior.desktop +usr/share/kservices5/fsview_part.desktop +usr/share/kservices5/khtml_*.desktop +usr/share/kxmlgui5/fsview/fsview_part.rc +usr/share/locale/*/LC_MESSAGES/akregator_konqplugin.mo +usr/share/locale/*/LC_MESSAGES/autorefresh.mo +usr/share/locale/*/LC_MESSAGES/babelfish.mo +usr/share/locale/*/LC_MESSAGES/dirfilterplugin.mo +usr/share/locale/*/LC_MESSAGES/fsview.mo +usr/share/locale/*/LC_MESSAGES/imgalleryplugin.mo +usr/share/locale/*/LC_MESSAGES/khtmlsettingsplugin.mo +usr/share/locale/*/LC_MESSAGES/khtmltts.mo +usr/share/locale/*/LC_MESSAGES/kshellcmdplugin.mo +usr/share/locale/*/LC_MESSAGES/searchbarplugin.mo +usr/share/locale/*/LC_MESSAGES/uachangerplugin.mo +usr/share/qlogging-categories5/akregatorplugin.categories +usr/share/qlogging-categories5/fsview.categories diff --git a/konq-plugins.maintscript b/konq-plugins.maintscript new file mode 100644 index 0000000..f3e69e0 --- /dev/null +++ b/konq-plugins.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/xdg/akregatorplugin.categories 4:19.08.2-1~ diff --git a/konqueror.install b/konqueror.install new file mode 100755 index 0000000..effa00f --- /dev/null +++ b/konqueror.install @@ -0,0 +1,53 @@ +#!/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/kservices5/webenginepart.desktop +[amd64 arm64 armhf i386 mipsel] usr/share/kxmlgui5/webenginepart/ +etc/xdg/autostart/konqy_preload.desktop +etc/xdg/konqsidebartngrc +usr/bin/kfmclient +usr/bin/konqueror +usr/lib/*/libkdeinit5_kfmclient.so +usr/lib/*/libkdeinit5_konqueror.so +usr/lib/*/libkonqsidebarplugin.so.* +usr/lib/*/libkonquerorprivate.so.* +usr/lib/*/qt5/plugins/kcm_bookmarks.so +usr/lib/*/qt5/plugins/kcm_history.so +usr/lib/*/qt5/plugins/kcm_konq.so +usr/lib/*/qt5/plugins/kcm_konqhtml.so +usr/lib/*/qt5/plugins/kcm_performance.so +usr/lib/*/qt5/plugins/konq_sidebar.so +usr/lib/*/qt5/plugins/konqsidebar_bookmarks.so +usr/lib/*/qt5/plugins/konqsidebar_history.so +usr/lib/*/qt5/plugins/konqsidebar_places.so +usr/lib/*/qt5/plugins/konqsidebar_tree.so +usr/share/applications/kfmclient.desktop +usr/share/applications/kfmclient_*.desktop +usr/share/applications/konqbrowser.desktop +usr/share/config.kcfg/konqueror.kcfg +usr/share/dbus-1/interfaces/org.kde.Konqueror.*.xml +usr/share/doc/HTML/*/kcontrol5/ +usr/share/doc/HTML/*/konqueror/ +usr/share/icons/hicolor/*/apps/konqueror.png +usr/share/kcmcss/ +usr/share/kcontrol/pics/*png +usr/share/konqsidebartng/ +usr/share/konqueror/ +usr/share/kservices5/bookmarks.desktop +usr/share/kservices5/kcmhistory.desktop +usr/share/kservices5/kcmkonqyperformance.desktop +usr/share/kservices5/kcmperformance.desktop +usr/share/kservices5/konq_sidebartng.desktop +usr/share/kservices5/org.kde.konqueror.desktop +usr/share/kwebkitpart/ +usr/share/locale/*/LC_MESSAGES/kcmbookmarks.mo +usr/share/locale/*/LC_MESSAGES/kcmkonq.mo +usr/share/locale/*/LC_MESSAGES/kcmkonqhtml.mo +usr/share/locale/*/LC_MESSAGES/kcmperformance.mo +usr/share/locale/*/LC_MESSAGES/kfmclient.mo +usr/share/locale/*/LC_MESSAGES/konqueror.mo +usr/share/locale/*/LC_MESSAGES/webenginepart.mo +usr/share/metainfo/org.kde.konqueror.appdata.xml +usr/share/qlogging-categories5/konqueror.categories +usr/share/webenginepart/ diff --git a/konqueror.lintian-overrides b/konqueror.lintian-overrides new file mode 100644 index 0000000..34741d0 --- /dev/null +++ b/konqueror.lintian-overrides @@ -0,0 +1,13 @@ +konqueror: package-name-doesnt-match-sonames libkdeinit5-kfmclient libkdeinit5-konqueror libkonqsidebarplugin5 libkonquerorprivate5 libkwebenginepart +konqueror: shared-library-lacks-version usr/lib/*/libkdeinit5_kfmclient.so libkdeinit5_kfmclient.so +konqueror: shared-library-lacks-version usr/lib/*/libkwebenginepart.so libkwebenginepart.so +konqueror: shared-library-lacks-version usr/lib/*/libkdeinit5_konqueror.so libkdeinit5_konqueror.so +konqueror: no-symbols-control-file usr/lib/*/libkonquerorprivate.so.* +konqueror: no-symbols-control-file usr/lib/*/libkdeinit5_kfmclient.so +konqueror: no-symbols-control-file usr/lib/*/libkdeinit5_konqueror.so +konqueror: no-symbols-control-file usr/lib/*/libkwebenginepart.so +konqueror: no-symbols-control-file usr/lib/*/libkonqsidebarplugin.so.* +# it's the in-browser about page +konqueror: package-contains-documentation-outside-usr-share-doc usr/share/konqueror/about/* +# error pages for the web engine part +konqueror: package-contains-documentation-outside-usr-share-doc usr/share/webenginepart/* diff --git a/konqueror.maintscript b/konqueror.maintscript new file mode 100644 index 0000000..a6f9456 --- /dev/null +++ b/konqueror.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/xdg/konqueror.categories 4:20.04.3-1~ diff --git a/konqueror.postinst b/konqueror.postinst new file mode 100644 index 0000000..60dab12 --- /dev/null +++ b/konqueror.postinst @@ -0,0 +1,22 @@ +#! /bin/sh -e + +case "$1" in + configure) + update-alternatives --install /usr/bin/x-www-browser \ + x-www-browser /usr/bin/konqueror 30 \ + --slave /usr/share/man/man1/x-www-browser.1.gz \ + x-www-browser.1.gz /usr/share/man/man1/konqueror.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/konqueror.prerm b/konqueror.prerm new file mode 100644 index 0000000..dc7be8e --- /dev/null +++ b/konqueror.prerm @@ -0,0 +1,22 @@ +#! /bin/sh -e + +case "$1" in + remove) + update-alternatives --remove x-www-browser /usr/bin/konqueror + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/libkf5konq-dev.install b/libkf5konq-dev.install new file mode 100644 index 0000000..fc922c6 --- /dev/null +++ b/libkf5konq-dev.install @@ -0,0 +1,4 @@ +usr/include/KF5/konq_*.h +usr/include/KF5/libkonq_export.h +usr/lib/*/cmake/KF5Konq/ +usr/lib/*/libKF5Konq.so diff --git a/libkf5konq6.install b/libkf5konq6.install new file mode 100644 index 0000000..f1cd84e --- /dev/null +++ b/libkf5konq6.install @@ -0,0 +1,2 @@ +usr/lib/*/libKF5Konq.so.* +usr/share/locale/*/LC_MESSAGES/libkonq.mo diff --git a/patches/optional-qtwebengine.diff b/patches/optional-qtwebengine.diff new file mode 100644 index 0000000..120a750 --- /dev/null +++ b/patches/optional-qtwebengine.diff @@ -0,0 +1,58 @@ +Author: Pino Toscano +Description: Make QtWebEngine an optional requirement + This makes it possible to build konqueror, albeith without an HTML component, + also on architectures that do not have QtWebEngine. +Forwarded: no +Last-Update: 2020-05-02 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,8 @@ include(CMakePackageConfigHelpers) + set(KONQUEROR_LIB_VERSION "${RELEASE_SERVICE_VERSION}") + set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}") + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets) ++find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS WebEngineWidgets) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils Archive Crash WindowSystem Init IconThemes DBusAddons) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KDELibs4Support) + +@@ -66,7 +67,9 @@ add_subdirectory( client ) + if(BUILD_TESTING) + add_subdirectory( autotests ) + endif() +-add_subdirectory( webenginepart ) ++if (Qt5WebEngineWidgets_FOUND) ++ add_subdirectory( webenginepart ) ++endif() + + add_subdirectory( pics ) + add_subdirectory( sidebar ) +--- a/autotests/CMakeLists.txt ++++ b/autotests/CMakeLists.txt +@@ -7,8 +7,10 @@ include_directories( ${CMAKE_CURRENT_SOU + + ########### konqviewmgrtest ############### + +-ecm_add_test(konqviewmgrtest.cpp +- LINK_LIBRARIES kdeinit_konqueror Qt5::Core Qt5::Gui kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test) ++if (Qt5WebEngineWidgets_FOUND) ++ ecm_add_test(konqviewmgrtest.cpp ++ LINK_LIBRARIES kdeinit_konqueror Qt5::Core Qt5::Gui kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test) ++endif() + + ########### historymanagertest ############### + +@@ -22,8 +24,10 @@ ecm_add_test(undomanagertest.cpp + + ########### konqhtmltest ############### + +-ecm_add_test(konqhtmltest.cpp +- LINK_LIBRARIES kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test) ++if (Qt5WebEngineWidgets_FOUND) ++ ecm_add_test(konqhtmltest.cpp ++ LINK_LIBRARIES kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test) ++endif() + + ########### konqviewtest ############### + diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..3e3084e --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +optional-qtwebengine.diff diff --git a/rules b/rules new file mode 100755 index 0000000..6f2386f --- /dev/null +++ b/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +l10npkgs_firstversion_ok := 4:16.04.3-10~ +include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk + +%: + dh $@ --with kf5 + +override_dh_auto_configure: + dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF + +override_dh_auto_test: + # Disable dh_auto_test at build time + : + +override_dh_auto_install: + dh_auto_install + # do not ship the development files for konqsidebarplugin, for now + rm -f debian/tmp/usr/include/konqsidebarplugin.h + rm -f debian/tmp/usr/lib/*/libkonqsidebarplugin.so + +override_dh_gencontrol: l10npkgs_firstversion_ok + dh_gencontrol diff --git a/salsa-ci.yml b/salsa-ci.yml new file mode 100644 index 0000000..f71bdf3 --- /dev/null +++ b/salsa-ci.yml @@ -0,0 +1,7 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +variables: + SALSA_CI_DISABLE_MISSING_BREAKS: 'no' + SALSA_CI_DISABLE_RC_BUGS: 'no' + SALSA_CI_REPROTEST_ARGS: '--variations=-build-path' diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/upstream/metadata b/upstream/metadata new file mode 100644 index 0000000..ba13d6f --- /dev/null +++ b/upstream/metadata @@ -0,0 +1,5 @@ +Changelog: https://cgit.kde.org/konqueror.git/log +Donation: https://www.kde.org/community/donations/index.php +Repository: https://anongit.kde.org/konqueror.git +Repository-Browse: https://cgit.kde.org/konqueror.git +Security-Contact: security@kde.org diff --git a/upstream/signing-key.asc b/upstream/signing-key.asc new file mode 100644 index 0000000..c9210bf --- /dev/null +++ b/upstream/signing-key.asc @@ -0,0 +1,81 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +hC+sXh0NMOq4pxE= +=Wqdv +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFlRpEYBCACecX3F5xzF6wzeXiuBAuHq74bVHON7I89U+ROloEWYUYMRNTz2 +l1BkNHWRTTqfmPO7LhMY6g4gOPeQVCwgTGVjI8bn6sJd3SFdeiRvvaFBpmn7SjBd +s1rkKKJIjeMUl1w8dFnmf22V0PnhSSepmNwmd8RQnl1umCTSihDJydGxixw6ZNhr +4tzbn+Rfadybli61H2hc6/JJHe91i+V1ltgkHwGcs6MUCqXgSL0dUIJs49gSrla0 +gkrcJYF5MWyGxKlajbCjkMCJtN+8bhEmpc4Oe8NZ33arEWnlyh1RVgi5p3RTNApY +Pxctcg57ExczbKn9R8VLYmPJ7Di3gX0cmotrABEBAAG0HkNocmlzdG9waCBGZWNr +IDxjZmVja0BrZGUub3JnPokBTgQTAQgAOBYhBPIydeS/EK/B32kUptvSzok+LRyH +BQJZUaRGAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJENvSzok+LRyHeWcH +/A1E2d5UL2oHsrLIolIiWMmheRorcac+0Hgll1mMUQ5tfPH+LVzgrlMMG7g1Amky +Hk1qZ5oszrXUg2H/28/cOF/WVlHgQcSGr7aQbHieUivPtZMua+lHUdILC3UV2l1V +22Zz8HIDl4kxmK6EpoNIOK5Mo550S3e3AKYq5pa/FlckCV9/JoK9+thRCsoAAj3g +oWwTx9RY5pmLPtklqyC5961Je7KHSIVqapJ/G5DX+yfOC1Psc+vIfyQVqnaefZPW +dIxXQQhn46i6IRRimw94Gkwca+wslkimt/L/Z7ByZqBsXMyixSQPq+dtSO9CMgr0 +WxTX78wATkTGzh5oSwKCMga5AQ0EWVGkRgEIAMuUnfNfrdx8xn7Jjcm6MGkB/Yep +XVysrlHxUUS6q7629JdSlVWnQo9GFO927GZClWI9rCGLQMfZZk/jfgKV/nkpLod3 +I51remOg7ohSkwRLAdwJ7xCuNrafhKntFh5/NxuaXxaVIY1muvZbTAsIRyks2jCE +pUoK43Z8dr4/QPhBstssB8czDME1Tw4r7X+RwjFrQqDItFv6f0BIdEwR462khLEw +vbXRN1nzs+6Y0foJbJCS3VDZC9scsrrMVMV+OEBF3DXp9ypSWsLnkuBPPIus6Y8G +j7JvYUBtrUhKL5a7o5G3Te9YhwGgOKVqWlncs6ZLiOV6HnG0BO3xdPcn09cAEQEA +AYkBNgQYAQgAIBYhBPIydeS/EK/B32kUptvSzok+LRyHBQJZUaRGAhsMAAoJENvS +zok+LRyHaRMIAI5YaTfGeQDmR08I2LvztOEH/3YF63cNCP/Vp+WAtF/Kr8mMFpFS +oTHJNMi7p964lHYTTPzPeQzLzV3ayiQjq+DHs6HFmYl73ukzlGGc7KDlyhugQjm6 +AqNtqqXAVykaixnFj8jf2WtQGl1hqpm8GhDRBmZycqMqne4tZokujhtpdC6suRvc +AB0S+lRZUwrY05k6Nc1A8J8k/lxXXa9KzXNaqKsqppgBZoqKN3zS4146uEjvuLsh +CarZ/6uUidvP0LBTR7HKye5A9Qdbjlg9qvtR7YF3hqy4g1PRNZWRlsQ1pkCdCTfN +TA+HYUzK0ESVpY72lWvH49lNg+ufZ1bKvKI= +=MZJ5 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/watch b/watch new file mode 100644 index 0000000..2c4d4e7 --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=4 +opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/release-service/([\d.]+)/src/@PACKAGE@-([\d.]+)\.tar\.xz