[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.08.3-1-8-g1d68292
Pino Toscano
pino at moszumanska.debian.org
Sun Dec 24 15:38:35 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=32604bf
The following commit has been merged in the master branch:
commit 32604bf0a95242b320574841d46146f927062313
Author: Pino Toscano <pino at debian.org>
Date: Sun Dec 24 16:36:14 2017 +0100
drop konqueror & co
---
debian/changelog | 16 ++
debian/control | 126 +------------
debian/dolphin4.install | 19 --
debian/dolphin4.lintian-overrides | 4 -
debian/kde-baseapps-bin.install | 5 -
debian/kde-baseapps-bin.manpages | 1 +
debian/kde-baseapps-data.install | 23 ---
debian/konq-plugins.install | 94 ----------
debian/konqueror-nsplugins.install | 6 -
debian/konqueror.install | 91 ---------
debian/konqueror.lintian-overrides | 2 -
debian/konqueror.manpages | 3 -
debian/konqueror.postinst | 22 ---
debian/konqueror.prerm | 22 ---
debian/libkonqsidebarplugin-dev.install | 2 -
debian/libkonqsidebarplugin4a.acc | 16 --
debian/libkonqsidebarplugin4a.install | 2 -
debian/libkonqsidebarplugin4a.lintian-overrides | 1 -
debian/libkonqsidebarplugin4a.symbols | 46 -----
debian/man/kfmclient.1 | 58 ------
debian/man/konqueror.1 | 239 ------------------------
debian/not-installed | 11 --
debian/patches/kubuntu_ignore-tests.diff | 40 ----
debian/patches/optional-parts.diff | 47 +++++
debian/patches/series | 2 +-
debian/rules | 2 +-
26 files changed, 71 insertions(+), 829 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 760dacc..5fb7fe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,22 @@ kde-baseapps (4:16.08.3-2~) UNRELEASED; urgency=medium
[ Pino Toscano ]
* Bump Standards-Version to 4.1.2, no changes required.
+ * Make it possible to disable building of certain components; patch
+ optional-parts.diff.
+ * Remove konqueror and almost all its associated binaries, as they will be
+ provided by an own konqueror source: (Closes: #883706)
+ - drop the dolphin4, konq-plugins, konqueror, konqueror-nsplugins,
+ libkonqsidebarplugin-dev, and libkonqsidebarplugin4a binaries
+ - move the keditbookmarks man page to kde-baseapps-bin, together with the
+ executable; add proper breaks/replaces
+ - drop install files
+ - drop the local kfmclient, and konqueror man pages
+ - update the patches accordingly:
+ - kubuntu_ignore-tests.diff: drop, no more needed
+ - pass -DBUILD_dolphin=false -DBUILD_konqueror=false
+ -DBUILD_konq-plugins=false -DBUILD_nsplugins=false to cmake
+ - update install files of kde-baseapps-bin, and kde-baseapps-data
+ - clean not-installed file
-- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 31 Oct 2017 17:59:45 +0100
diff --git a/debian/control b/debian/control
index 375273e..9659312 100644
--- a/debian/control
+++ b/debian/control
@@ -29,28 +29,16 @@ Homepage: http://www.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kde-baseapps.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kde-baseapps.git
-Package: dolphin4
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: dolphin (<< 4:15.08), kde-baseapps-data (<< 4:15.08.2)
-Replaces: dolphin (<< 4:15.08), kde-baseapps-data (<< 4:15.08.2)
-Description: file browser
- Dolphin file browser, this kdelibs4 build is mainly for use with
- Konqueror.
- .
- This package is part of the KDE base applications module.
-
Package: kde-baseapps
Architecture: all
Depends: dolphin,
kde-baseapps-bin (>= ${source:Version}),
kdepasswd (>= ${source:Version}),
kfind (>= ${source:Version}),
- konqueror (>= ${source:Version}),
+ konqueror,
konsole,
kwrite,
${misc:Depends},
-Recommends: konqueror-nsplugins (>= ${source:Version})
Breaks: kdebase-apps (<< 4:4.7.2)
Replaces: kdebase-apps (<< 4:4.7.2)
Description: base applications from the official KDE release (metapackage)
@@ -68,8 +56,10 @@ Architecture: any
Depends: kde-baseapps-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends},
-Breaks: kcontrol, kdebase-bin (<< 4:4.7.2), kdesktop
-Replaces: kdebase-bin (<< 4:4.7.2)
+Breaks: kcontrol, kdebase-bin (<< 4:4.7.2), kdesktop,
+ konqueror (<< 4:16.08.3-2~)
+Replaces: kdebase-bin (<< 4:4.7.2),
+ konqueror (<< 4:16.08.3-2~)
Description: core binaries for the KDE base applications
This package contains miscellaneous programs needed by other KDE
applications, particularly those in the KDE base module.
@@ -123,90 +113,6 @@ Description: file search utility
.
This package is part of the KDE base applications module.
-Package: konq-plugins
-Architecture: any
-Depends: konqueror (>= 4:4.1.0),
- libjpeg-turbo-progs,
- python,
- ${misc:Depends},
- ${shlibs:Depends},
-Enhances: konqueror
-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: dolphin4 (= ${binary:Version}),
- install-info,
- kde-baseapps-bin (= ${binary:Version}),
- kde-baseapps-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends},
-Suggests: konq-plugins (>= 4:4.1~)
-Recommends: kfind, konqueror-nsplugins (= ${binary:Version}), kpart-webkit
-Breaks: kde-baseapps-data (<< 4:4.8.4), kdebase-data (<< 4:4.7.2)
-Replaces: kde-baseapps-data (<< 4:4.8.4), kdebase-data (<< 4:4.7.2)
-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: konqueror-nsplugins
-Section: web
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: gtk-qt-engine (<< 1:1.0)
-Description: Netscape plugin support for Konqueror
- Konqueror is the KDE web browser and advanced file manager.
- .
- This package provides a KDE component for enabling the use of
- Netscape/Mozilla/etc browser plugins (such as Adobe Flash) within Konqueror.
- .
- This package is part of the KDE base applications module.
-
Package: libkonq-common
Section: libs
Architecture: any
@@ -255,25 +161,3 @@ Description: core libraries for Konqueror
particularly Konqueror.
.
This package is part of the KDE base applications module.
-
-Package: libkonqsidebarplugin-dev
-Section: libdevel
-Architecture: any
-Depends: libkonqsidebarplugin4a (= ${binary:Version}),
- ${misc:Depends},
- ${sameVersionDep:kdelibs5-dev:libkonqsidebarplugin4a},
-Description: konqueror sidebar plugin library development files
- This package contains development headers for the Konqueror sidebar plugin
- library.
- .
- This package is part of the KDE base applications module.
-
-Package: libkonqsidebarplugin4a
-Section: libs
-Architecture: any
-X-Debian-ABI: 0
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: konqueror sidebar plugin library
- This package contains the base library for Konqueror sidebar plugins.
- .
- This package is part of the KDE base applications module.
diff --git a/debian/dolphin4.install b/debian/dolphin4.install
deleted file mode 100644
index 7ff05a9..0000000
--- a/debian/dolphin4.install
+++ /dev/null
@@ -1,19 +0,0 @@
-usr/bin/dolphin4
-usr/lib/kde4/dolphinpart.so
-usr/lib/kde4/kcm_dolphingeneral.so
-usr/lib/kde4/kcm_dolphinnavigation.so
-usr/lib/kde4/kcm_dolphinservices.so
-usr/lib/kde4/kcm_dolphinviewmodes.so
-usr/lib/kde4/kio_filenamesearch.so
-usr/lib/libdolphinprivate4.so.4*
-usr/lib/libkdeinit4_dolphin4.so
-usr/share/kde4/apps/dolphin/dolphinui.rc
-usr/share/kde4/apps/dolphinpart/dolphinpart.rc
-usr/share/kde4/config/servicemenu.knsrc
-usr/share/kde4/services/dolphinpart.desktop
-usr/share/kde4/services/filenamesearch.protocol
-usr/share/kde4/services/kcmdolphingeneral.desktop
-usr/share/kde4/services/kcmdolphinnavigation.desktop
-usr/share/kde4/services/kcmdolphinservices.desktop
-usr/share/kde4/services/kcmdolphinviewmodes.desktop
-usr/share/kde4/servicetypes/fileviewversioncontrolplugin.desktop
diff --git a/debian/dolphin4.lintian-overrides b/debian/dolphin4.lintian-overrides
deleted file mode 100644
index 1d786b2..0000000
--- a/debian/dolphin4.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# private library
-dolphin4: package-name-doesnt-match-sonames libdolphinprivate4-4
-# private library
-dolphin4: no-symbols-control-file
diff --git a/debian/kde-baseapps-bin.install b/debian/kde-baseapps-bin.install
index 3bced0d..4e43a8c 100644
--- a/debian/kde-baseapps-bin.install
+++ b/debian/kde-baseapps-bin.install
@@ -1,11 +1,6 @@
usr/bin/kbookmarkmerger
usr/bin/kdialog
usr/bin/keditbookmarks
-usr/lib/kde4/kcm_kio.so
-usr/lib/kde4/kcm_konq.so
-usr/lib/kde4/kcm_konqhtml.so
-usr/lib/kde4/kcm_kurifilt.so
-usr/lib/kde4/kcm_performance.so
usr/lib/libkbookmarkmodel_private.so.4
usr/lib/libkbookmarkmodel_private.so.4.*
usr/lib/libkdeinit4_keditbookmarks.so
diff --git a/debian/kde-baseapps-bin.manpages b/debian/kde-baseapps-bin.manpages
new file mode 100644
index 0000000..8040d16
--- /dev/null
+++ b/debian/kde-baseapps-bin.manpages
@@ -0,0 +1 @@
+debian/man/keditbookmarks.1
diff --git a/debian/kde-baseapps-data.install b/debian/kde-baseapps-data.install
index d42f421..8467bb6 100644
--- a/debian/kde-baseapps-data.install
+++ b/debian/kde-baseapps-data.install
@@ -1,6 +1,3 @@
-usr/share/kde4/apps/kcmcss/template.css
-usr/share/kde4/apps/kcontrol/pics/onlyone.png
-usr/share/kde4/apps/kcontrol/pics/overlapping.png
usr/share/kde4/apps/kdm/pics/users/Blackbox.png
usr/share/kde4/apps/kdm/pics/users/Green.png
usr/share/kde4/apps/kdm/pics/users/Happy.png
@@ -10,24 +7,4 @@ usr/share/kde4/apps/kdm/pics/users/TV.png
usr/share/kde4/apps/kdm/pics/users/bomb.png
usr/share/kde4/apps/keditbookmarks/keditbookmarks-genui.rc
usr/share/kde4/apps/keditbookmarks/keditbookmarksui.rc
-usr/share/kde4/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
-usr/share/kde4/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc
usr/share/kde4/config.kcfg/keditbookmarks.kcfg
-usr/share/kde4/services/bookmarks.desktop
-usr/share/kde4/services/cache.desktop
-usr/share/kde4/services/cookies.desktop
-usr/share/kde4/services/ebrowsing.desktop
-usr/share/kde4/services/filebehavior.desktop
-usr/share/kde4/services/kcmkonqyperformance.desktop
-usr/share/kde4/services/kcmperformance.desktop
-usr/share/kde4/services/khtml_appearance.desktop
-usr/share/kde4/services/khtml_behavior.desktop
-usr/share/kde4/services/khtml_filter.desktop
-usr/share/kde4/services/khtml_general.desktop
-usr/share/kde4/services/khtml_java_js.desktop
-usr/share/kde4/services/netpref.desktop
-usr/share/kde4/services/proxy.desktop
-usr/share/kde4/services/smb.desktop
-usr/share/kde4/services/useragent.desktop
-usr/share/kde4/services/useragentstrings/
-usr/share/kde4/servicetypes/uasprovider.desktop
diff --git a/debian/konq-plugins.install b/debian/konq-plugins.install
deleted file mode 100644
index 1a6a2e4..0000000
--- a/debian/konq-plugins.install
+++ /dev/null
@@ -1,94 +0,0 @@
-usr/bin/fsview
-usr/lib/kde4/adblock.so
-usr/lib/kde4/akregatorkonqfeedicon.so
-usr/lib/kde4/autorefresh.so
-usr/lib/kde4/babelfishplugin.so
-usr/lib/kde4/dirfilterplugin.so
-usr/lib/kde4/domtreeviewerplugin.so
-usr/lib/kde4/fsviewpart.so
-usr/lib/kde4/khtmlsettingsplugin.so
-usr/lib/kde4/kimgallery.so
-usr/lib/kde4/minitoolsplugin.so
-usr/lib/kde4/rellinksplugin.so
-usr/lib/kde4/searchbarplugin.so
-usr/lib/kde4/uachangerplugin.so
-usr/lib/kde4/validatorsplugin.so
-usr/lib/kde4/webarchiverplugin.so
-usr/lib/kde4/webarchivethumbnail.so
-usr/share/icons/hicolor/22x22/apps/fsview.png
-usr/share/icons/hicolor/32x32/apps/fsview.png
-usr/share/icons/oxygen/16x16/actions/babelfish.png
-usr/share/icons/oxygen/16x16/actions/cssvalidator.png
-usr/share/icons/oxygen/16x16/actions/htmlvalidator.png
-usr/share/icons/oxygen/16x16/actions/imagegallery.png
-usr/share/icons/oxygen/16x16/actions/validators.png
-usr/share/icons/oxygen/16x16/actions/webarchiver.png
-usr/share/icons/oxygen/22x22/actions/babelfish.png
-usr/share/icons/oxygen/22x22/actions/cssvalidator.png
-usr/share/icons/oxygen/22x22/actions/htmlvalidator.png
-usr/share/icons/oxygen/22x22/actions/imagegallery.png
-usr/share/icons/oxygen/22x22/actions/validators.png
-usr/share/icons/oxygen/22x22/actions/webarchiver.png
-usr/share/icons/oxygen/32x32/actions/htmlvalidator.png
-usr/share/icons/oxygen/32x32/actions/validators.png
-usr/share/icons/oxygen/48x48/actions/htmlvalidator.png
-usr/share/icons/oxygen/48x48/actions/validators.png
-usr/share/icons/oxygen/64x64/actions/htmlvalidator.png
-usr/share/icons/oxygen/64x64/actions/validators.png
-usr/share/icons/oxygen/scalable/actions/htmlvalidator.svgz
-usr/share/icons/oxygen/scalable/actions/validators.svgz
-usr/share/kde4/apps/akregator/pics/feed.png
-usr/share/kde4/apps/dolphinpart/kpartplugins/dirfilterplugin.desktop
-usr/share/kde4/apps/dolphinpart/kpartplugins/dirfilterplugin.rc
-usr/share/kde4/apps/dolphinpart/kpartplugins/kimgalleryplugin.desktop
-usr/share/kde4/apps/dolphinpart/kpartplugins/kimgalleryplugin.rc
-usr/share/kde4/apps/domtreeviewer/domtreeviewerui.rc
-usr/share/kde4/apps/fsview/fsview_part.rc
-usr/share/kde4/apps/khtml/kpartplugins/akregator_konqfeedicon.desktop
-usr/share/kde4/apps/khtml/kpartplugins/akregator_konqfeedicon.rc
-usr/share/kde4/apps/khtml/kpartplugins/autorefresh.desktop
-usr/share/kde4/apps/khtml/kpartplugins/autorefresh.rc
-usr/share/kde4/apps/khtml/kpartplugins/khtmlsettingsplugin.desktop
-usr/share/kde4/apps/khtml/kpartplugins/khtmlsettingsplugin.rc
-usr/share/kde4/apps/khtml/kpartplugins/minitoolsplugin.desktop
-usr/share/kde4/apps/khtml/kpartplugins/minitoolsplugin.rc
-usr/share/kde4/apps/khtml/kpartplugins/plugin_adblock.desktop
-usr/share/kde4/apps/khtml/kpartplugins/plugin_adblock.rc
-usr/share/kde4/apps/khtml/kpartplugins/plugin_babelfish.rc
-usr/share/kde4/apps/khtml/kpartplugins/plugin_domtreeviewer.desktop
-usr/share/kde4/apps/khtml/kpartplugins/plugin_domtreeviewer.rc
-usr/share/kde4/apps/khtml/kpartplugins/plugin_rellinks.desktop
-usr/share/kde4/apps/khtml/kpartplugins/plugin_rellinks.rc
-usr/share/kde4/apps/khtml/kpartplugins/plugin_translator.desktop
-usr/share/kde4/apps/khtml/kpartplugins/plugin_validators.desktop
-usr/share/kde4/apps/khtml/kpartplugins/plugin_validators.rc
-usr/share/kde4/apps/khtml/kpartplugins/plugin_webarchiver.desktop
-usr/share/kde4/apps/khtml/kpartplugins/plugin_webarchiver.rc
-usr/share/kde4/apps/khtml/kpartplugins/uachangerplugin.desktop
-usr/share/kde4/apps/khtml/kpartplugins/uachangerplugin.rc
-usr/share/kde4/apps/konqueror/icons/oxygen/16x16/actions/google.png
-usr/share/kde4/apps/konqueror/icons/oxygen/22x22/actions/google.png
-usr/share/kde4/apps/konqueror/icons/oxygen/32x32/actions/google.png
-usr/share/kde4/apps/konqueror/icons/oxygen/48x48/actions/google.png
-usr/share/kde4/apps/konqueror/icons/oxygen/64x64/actions/google.png
-usr/share/kde4/apps/konqueror/icons/oxygen/scalable/actions/google.svgz
-usr/share/kde4/apps/konqueror/kpartplugins/searchbar.desktop
-usr/share/kde4/apps/konqueror/kpartplugins/searchbar.rc
-usr/share/kde4/apps/konqueror/opensearch/google.xml
-usr/share/kde4/apps/kwebkitpart/kpartplugins/akregator_konqfeedicon.desktop
-usr/share/kde4/apps/kwebkitpart/kpartplugins/akregator_konqfeedicon.rc
-usr/share/kde4/apps/kwebkitpart/kpartplugins/autorefresh.desktop
-usr/share/kde4/apps/kwebkitpart/kpartplugins/autorefresh.rc
-usr/share/kde4/apps/kwebkitpart/kpartplugins/khtmlsettingsplugin.desktop
-usr/share/kde4/apps/kwebkitpart/kpartplugins/khtmlsettingsplugin.rc
-usr/share/kde4/apps/kwebkitpart/kpartplugins/plugin_babelfish.rc
-usr/share/kde4/apps/kwebkitpart/kpartplugins/plugin_translator.desktop
-usr/share/kde4/apps/kwebkitpart/kpartplugins/plugin_validators.desktop
-usr/share/kde4/apps/kwebkitpart/kpartplugins/plugin_validators.rc
-usr/share/kde4/apps/kwebkitpart/kpartplugins/uachangerplugin.desktop
-usr/share/kde4/apps/kwebkitpart/kpartplugins/uachangerplugin.rc
-usr/share/kde4/config.kcfg/validators.kcfg
-usr/share/kde4/config/translaterc
-usr/share/kde4/services/ServiceMenus/imageconverter.desktop
-usr/share/kde4/services/fsview_part.desktop
-usr/share/kde4/services/webarchivethumbnail.desktop
diff --git a/debian/konqueror-nsplugins.install b/debian/konqueror-nsplugins.install
deleted file mode 100644
index 9ec9aab..0000000
--- a/debian/konqueror-nsplugins.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/nspluginscan
-usr/bin/nspluginviewer
-usr/lib/kde4/libkcminit_nsplugins.so
-usr/lib/kde4/libnsplugin.so
-usr/share/kde4/apps/nsplugin/nspluginpart.rc
-usr/share/kde4/services/khtml_plugins.desktop
diff --git a/debian/konqueror.install b/debian/konqueror.install
deleted file mode 100644
index 477eebb..0000000
--- a/debian/konqueror.install
+++ /dev/null
@@ -1,91 +0,0 @@
-usr/bin/kfmclient
-usr/bin/konqueror
-usr/lib/kde4/kcm_history.so
-usr/lib/kde4/kded_konqy_preloader.so
-usr/lib/kde4/khtmlkttsdplugin.so
-usr/lib/kde4/konq_aboutpage.so
-usr/lib/kde4/konq_shellcmdplugin.so
-usr/lib/kde4/konq_sidebar.so
-usr/lib/kde4/konq_sidebartree_bookmarks.so
-usr/lib/kde4/konq_sidebartree_dirtree.so
-usr/lib/kde4/konqsidebar_history.so
-usr/lib/kde4/konqsidebar_places.so
-usr/lib/kde4/konqsidebar_tree.so
-usr/lib/kde4/konqsidebar_web.so
-usr/lib/libkdeinit4_kfmclient.so
-usr/lib/libkdeinit4_konqueror.so
-usr/lib/libkonquerorprivate.so.4
-usr/lib/libkonquerorprivate.so.4.*
-usr/share/appdata/konqueror.appdata.xml
-usr/share/applications/kde4/Home.desktop
-usr/share/applications/kde4/kfmclient.desktop
-usr/share/applications/kde4/kfmclient_dir.desktop
-usr/share/applications/kde4/kfmclient_html.desktop
-usr/share/applications/kde4/kfmclient_war.desktop
-usr/share/applications/kde4/konqbrowser.desktop
-usr/share/applications/kde4/konquerorsu.desktop
-usr/share/autostart/konqy_preload.desktop
-usr/share/doc/kde/HTML/*/konqueror/
-usr/share/icons/hicolor/128x128/apps/konqueror.png
-usr/share/icons/hicolor/16x16/apps/konqueror.png
-usr/share/icons/hicolor/22x22/apps/konqueror.png
-usr/share/icons/hicolor/32x32/apps/konqueror.png
-usr/share/icons/hicolor/48x48/apps/konqueror.png
-usr/share/icons/hicolor/64x64/apps/konqueror.png
-usr/share/icons/hicolor/scalable/apps/konqueror.svgz
-usr/share/kde4/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
-usr/share/kde4/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc
-usr/share/kde4/apps/khtml/kpartplugins/khtmlkttsd.desktop
-usr/share/kde4/apps/khtml/kpartplugins/khtmlkttsd.rc
-usr/share/kde4/apps/konqsidebartng/dirtree/bookmarks_module.desktop
-usr/share/kde4/apps/konqsidebartng/dirtree/dirtree_module.desktop
-usr/share/kde4/apps/konqsidebartng/entries/bookmarks.desktop
-usr/share/kde4/apps/konqsidebartng/entries/history.desktop
-usr/share/kde4/apps/konqsidebartng/entries/home.desktop
-usr/share/kde4/apps/konqsidebartng/entries/places.desktop
-usr/share/kde4/apps/konqsidebartng/entries/remote.desktop
-usr/share/kde4/apps/konqsidebartng/entries/root.desktop
-usr/share/kde4/apps/konqsidebartng/entries/services.desktop
-usr/share/kde4/apps/konqsidebartng/plugins/konqsidebar_history.desktop
-usr/share/kde4/apps/konqsidebartng/plugins/konqsidebar_places.desktop
-usr/share/kde4/apps/konqsidebartng/plugins/konqsidebar_tree.desktop
-usr/share/kde4/apps/konqsidebartng/plugins/konqsidebar_web.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/.directory
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/ftp/.directory
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/.directory
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/services/.directory
-usr/share/kde4/apps/konqsidebartng/virtual_folders/services/applications.desktop
-usr/share/kde4/apps/konqueror/about/box-centre-konqueror.png
-usr/share/kde4/apps/konqueror/about/intro.html
-usr/share/kde4/apps/konqueror/about/konq.css
-usr/share/kde4/apps/konqueror/about/launch.html
-usr/share/kde4/apps/konqueror/about/lightning.png
-usr/share/kde4/apps/konqueror/about/plugins.html
-usr/share/kde4/apps/konqueror/about/plugins_rtl.html
-usr/share/kde4/apps/konqueror/about/specs.html
-usr/share/kde4/apps/konqueror/about/tips.html
-usr/share/kde4/apps/konqueror/about/top-left-konqueror.png
-usr/share/kde4/apps/konqueror/konqueror.rc
-usr/share/kde4/apps/konqueror/pics/indicator_connect.png
-usr/share/kde4/apps/konqueror/pics/indicator_empty.png
-usr/share/kde4/apps/konqueror/pics/indicator_noconnect.png
-usr/share/kde4/apps/konqueror/pics/indicator_viewactive.png
-usr/share/kde4/apps/konqueror/profiles/filemanagement
-usr/share/kde4/apps/konqueror/profiles/kde_devel
-usr/share/kde4/apps/konqueror/profiles/midnightcommander
-usr/share/kde4/apps/konqueror/profiles/tabbedbrowsing
-usr/share/kde4/apps/konqueror/profiles/webbrowsing
-usr/share/kde4/config.kcfg/konqueror.kcfg
-usr/share/kde4/config/konqsidebartngrc
-usr/share/kde4/services/kcmhistory.desktop
-usr/share/kde4/services/kded/konqy_preloader.desktop
-usr/share/kde4/services/konq_aboutpage.desktop
-usr/share/kde4/services/konq_sidebartng.desktop
-usr/share/kde4/services/konqueror.desktop
-usr/share/kde4/servicetypes/konqaboutpage.desktop
-usr/share/man/man1/kbookmarkmerger.1
diff --git a/debian/konqueror.lintian-overrides b/debian/konqueror.lintian-overrides
deleted file mode 100644
index 16e0730..0000000
--- a/debian/konqueror.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-konqueror: package-name-doesnt-match-sonames libkonquerorprivate4
-konqueror: hardening-no-fortify-functions usr/lib/kde4/konq_shellcmdplugin.so
diff --git a/debian/konqueror.manpages b/debian/konqueror.manpages
deleted file mode 100644
index 71ce391..0000000
--- a/debian/konqueror.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/keditbookmarks.1
-debian/man/kfmclient.1
-debian/man/konqueror.1
diff --git a/debian/konqueror.postinst b/debian/konqueror.postinst
deleted file mode 100644
index 60dab12..0000000
--- a/debian/konqueror.postinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /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/debian/konqueror.prerm b/debian/konqueror.prerm
deleted file mode 100644
index dc7be8e..0000000
--- a/debian/konqueror.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /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/debian/libkonqsidebarplugin-dev.install b/debian/libkonqsidebarplugin-dev.install
deleted file mode 100644
index 0217588..0000000
--- a/debian/libkonqsidebarplugin-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/konqsidebarplugin.h
-usr/lib/libkonqsidebarplugin.so
diff --git a/debian/libkonqsidebarplugin4a.acc b/debian/libkonqsidebarplugin4a.acc
deleted file mode 100644
index 78ca66d..0000000
--- a/debian/libkonqsidebarplugin4a.acc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 4.11.3
-</version>
-
-<headers>
- /usr/include/konqsidebarplugin.h
-</headers>
-
-<libs>
- /usr/lib/libkonqsidebarplugin.so
-</libs>
-
-</descriptor>
diff --git a/debian/libkonqsidebarplugin4a.install b/debian/libkonqsidebarplugin4a.install
deleted file mode 100644
index 848d527..0000000
--- a/debian/libkonqsidebarplugin4a.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libkonqsidebarplugin.so.4
-usr/lib/libkonqsidebarplugin.so.4.*
diff --git a/debian/libkonqsidebarplugin4a.lintian-overrides b/debian/libkonqsidebarplugin4a.lintian-overrides
deleted file mode 100644
index 5d438f9..0000000
--- a/debian/libkonqsidebarplugin4a.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkonqsidebarplugin4a: package-name-doesnt-match-sonames libkonqsidebarplugin4
diff --git a/debian/libkonqsidebarplugin4a.symbols b/debian/libkonqsidebarplugin4a.symbols
deleted file mode 100644
index 56cfa5d..0000000
--- a/debian/libkonqsidebarplugin4a.symbols
+++ /dev/null
@@ -1,46 +0,0 @@
-# SymbolsHelper-Confirmed: 4:16.04.3 amd64 ppc64
-libkonqsidebarplugin.so.4 libkonqsidebarplugin4a #MINVER#
- ABI_4_0 at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule10enableCopyEb at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule10setCaptionERK7QString at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule11configGroupEv at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule11enablePasteEb at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule11openPreviewERK13KFileItemList at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule11qt_metacallEN11QMetaObject4CallEiPPv at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule11qt_metacastEPKc at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule12enableActionEPS_PKcb at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule13handlePreviewERK13KFileItemList at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule13showPopupMenuERK6QPointRK13KFileItemListRKN6KParts16OpenUrlArgumentsERKNS6_16BrowserArgumentsE6QFlagsINS6_16BrowserExtension9PopupFlagEERK4QMapI7QString5QListIP7QActionEE at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule14openUrlRequestERK4KUrlRKN6KParts16OpenUrlArgumentsERKNS3_16BrowserArgumentsE at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule15createNewWindowERK4KUrlRKN6KParts16OpenUrlArgumentsERKNS3_16BrowserArgumentsERKNS3_10WindowArgsE at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule16staticMetaObjectE at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule17submitFormRequestEPKcRK7QStringRK10QByteArrayS4_S4_S4_ at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule22openPreviewOnMouseOverERK9KFileItem at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule24handlePreviewOnMouseOverERK9KFileItem at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule7openUrlERK4KUrl at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule7setIconERK7QString at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule7startedEPN3KIO3JobE at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule9completedEv at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule9enableCutEb at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModule9popupMenuEPS_RK6QPointRK13KFileItemListRKN6KParts16OpenUrlArgumentsERKNS7_16BrowserArgumentsE6QFlagsINS7_16BrowserExtension9PopupFlagEERK4QMapI7QString5QListIP7QActionEE at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModuleC1ERK14KComponentDataP7QObjectRK12KConfigGroup at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModuleC2ERK14KComponentDataP7QObjectRK12KConfigGroup at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModuleD0Ev at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModuleD1Ev at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarModuleD2Ev at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarPlugin11qt_metacallEN11QMetaObject4CallEiPPv at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarPlugin11qt_metacastEPKc at ABI_4_0 4:4.6.1
- _ZN17KonqSidebarPlugin16staticMetaObjectE at ABI_4_0 4:4.6.1
- _ZNK17KonqSidebarModule10metaObjectEv at ABI_4_0 4:4.6.1
- _ZNK17KonqSidebarModule12isCutEnabledEv at ABI_4_0 4:4.6.1
- _ZNK17KonqSidebarModule13isCopyEnabledEv at ABI_4_0 4:4.6.1
- _ZNK17KonqSidebarModule14isPasteEnabledEv at ABI_4_0 4:4.6.1
- _ZNK17KonqSidebarModule19parentComponentDataEv at ABI_4_0 4:4.6.1
- _ZNK17KonqSidebarPlugin10metaObjectEv at ABI_4_0 4:4.6.1
- _ZTI17KonqSidebarModule at ABI_4_0 4:4.6.1
- _ZTI17KonqSidebarPlugin at ABI_4_0 4:4.6.1
- _ZTS17KonqSidebarModule at ABI_4_0 4:4.6.1
- _ZTS17KonqSidebarPlugin at ABI_4_0 4:4.6.1
- _ZTV17KonqSidebarModule at ABI_4_0 4:4.6.1
- _ZTV17KonqSidebarPlugin at ABI_4_0 4:4.6.1
- dlrestrictions_data at ABI_4_0 4:4.6.3
diff --git a/debian/man/kfmclient.1 b/debian/man/kfmclient.1
deleted file mode 100644
index 5a53c4f..0000000
--- a/debian/man/kfmclient.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KFMCLIENT 1 "Aug 2008" "K Desktop Environment" "KDE tool for opening URLs from the command line"
-.SH NAME
-kfmclient
-\- KDE tool for opening URLs from the command line
-.SH SYNOPSIS
-kfmclient [KDE\-tempfile\-options] [options] command [URL(s)]
-.SH DESCRIPTION
-KDE tool for opening URLs from the command line
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command (see --commands)
-URL(s) Arguments for command
-.SS Options:
-.TP
-.B \-\-noninteractive
-Non interactive use: no message boxes
-.TP
-.B \-\-commands
-Show available commands
-.SS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-kde\-tempfile
-Show KDE-tempfile specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kfmclient/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/kfmclient/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-
diff --git a/debian/man/konqueror.1 b/debian/man/konqueror.1
deleted file mode 100644
index ad3acad..0000000
--- a/debian/man/konqueror.1
+++ /dev/null
@@ -1,239 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KONQUEROR 1 "Aug 2008" "K Desktop Environment" "Web browser, file manager and document viewer."
-.SH NAME
-konqueror
-\- Web browser, file manager and document viewer.
-.SH SYNOPSIS
-konqueror [Qt\-options] [KDE\-options] [KDE\-tempfile\-options] [options] [URL]
-.SH DESCRIPTION
-Web browser, file manager and document viewer.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Location to open
-.SS Options:
-.TP
-.B \-\-silent
-Start without a default window
-.TP
-.B \-\-preload
-Preload for later use
-.TP
-.B \-\-profile <profile>
-Profile to open
-.TP
-.B \-\-profiles
-List available profiles
-.TP
-.B \-\-mimetype <mimetype>
-Mimetype to use for this URL (e.g. text/html or inode/directory)
-.TP
-.B \-\-select
-For URLs that point to files, opens the directory and selects the file, instead of opening the actual file
-.SS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.B \-\-help\-kde\-tempfile
-Show KDE-tempfile specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS KDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.TP
-.B \-\-stylesheet
-<file.qss> applies the Qt stylesheet to the application widgets
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/konqueror/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/konqueror/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure at kde.org>
-.br
-Simon Hausmann <hausmann at kde.org>
-.br
-Michael Reiher <michael.reiher at gmx.de>
-.br
-Matthias Welk <welk at fokus.gmd.de>
-.br
-Alexander Neundorf <neundorf at kde.org>
-.br
-Michael Brade <brade at kde.org>
-.br
-Lars Knoll <knoll at kde.org>
-.br
-Dirk Mueller <mueller at kde.org>
-.br
-Peter Kelly <pmk at post.com>
-.br
-Waldo Bastian <bastian at kde.org>
-.br
-Germain Garand <germain at ebooksfrance.org>
-.br
-Leo Savernik <l.savernik at aon.at>
-.br
-Stephan Kulow <coolo at kde.org>
-.br
-Antti Koivisto <koivisto at kde.org>
-.br
-Zack Rusin <zack at kde.org>
-.br
-Tobias Anton <anton at stud.fbi.fh-darmstadt.de>
-.br
-Lubos Lunak <l.lunak at kde.org>
-.br
-Allan Sandfeld Jensen <kde at carewolf.com>
-.br
-Apple Safari Developers
-.br
-Harri Porten <porten at kde.org>
-.br
-Koos Vriezen <koos.vriezen at xs4all.nl>
-.br
-Matt Koss <koss at miesto.sk>
-.br
-Alex Zepeda <zipzippy at sonic.net>
-.br
-Richard Moore <rich at kde.org>
-.br
-Dima Rogozin <dima at mercury.co.il>
-.br
-Wynn Wilkes <wynnw at calderasystems.com>
-.br
-Stefan Schimanski <schimmi at kde.org>
-.br
-George Staikos <staikos at kde.org>
-.br
-Dawit Alemayehu <adawit at kde.org>
-.br
-Carsten Pfeiffer <pfeiffer at kde.org>
-.br
-Torsten Rahn <torsten at kde.org>
-.br
-Torben Weis <weis at kde.org>
-.br
-Joseph Wenninger <jowenn at kde.org>
-.br
-Stephan Binner <binner at kde.org>
-.br
-Ivor Hewitt <ivor at ivor.org>
-.br
-Eduardo Robles Elvira <edulix at gmail.com>
-.br
-
diff --git a/debian/not-installed b/debian/not-installed
index 3d2a607..0bb5350 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,23 +1,12 @@
# Symlinks of private libraries
-./usr/lib/libdolphinprivate4.so
./usr/lib/libkbookmarkmodel_private.so
# Only for deveploment and we are not shipping any kdebase-dev
-./usr/share/dbus-1/interfaces/org.kde.Konqueror.Main.xml
-./usr/share/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml
./usr/share/dbus-1/interfaces/org.kde.kdialog.ProgressDialog.xml
-./usr/share/dbus-1/interfaces/org.kde.konqueror.Preloader.xml
-./usr/share/dbus-1/interfaces/org.kde.nsplugins.CallBack.xml
-./usr/share/dbus-1/interfaces/org.kde.nsplugins.class.xml
-./usr/share/dbus-1/interfaces/org.kde.nsplugins.instance.xml
-./usr/share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
# Manpages are compressed
./usr/share/man/man1/kbookmarkmerger.1
./usr/share/man/man1/kfind.1
# These are moved by dh_movelibkdeinit
-./usr/lib/libkdeinit4_dolphin4.so
./usr/lib/libkdeinit4_keditbookmarks.so
-./usr/lib/libkdeinit4_kfmclient.so
-./usr/lib/libkdeinit4_konqueror.so
diff --git a/debian/patches/kubuntu_ignore-tests.diff b/debian/patches/kubuntu_ignore-tests.diff
deleted file mode 100644
index 5d8cac5..0000000
--- a/debian/patches/kubuntu_ignore-tests.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Jul 2016 05:35:22 +0200
-Subject: kubuntu_ignore-tests
-
----
- konqueror/src/tests/CMakeLists.txt | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/konqueror/src/tests/CMakeLists.txt b/konqueror/src/tests/CMakeLists.txt
-index 96923ed..6fade68 100644
---- a/konqueror/src/tests/CMakeLists.txt
-+++ b/konqueror/src/tests/CMakeLists.txt
-@@ -9,12 +9,6 @@ kde4_add_executable(centralwidget TEST centralwidget.cpp)
- target_link_libraries(centralwidget konq ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
- ${QT_QTTEST_LIBRARY})
-
--########### konqviewmgrtest ###############
--
--kde4_add_unit_test(konqviewmgrtest TEST konqviewmgrtest.cpp)
--target_link_libraries(konqviewmgrtest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
-- ${KDE4_KHTML_LIBS} ${QT_QTTEST_LIBRARY})
--
- ########### historymanagertest ###############
-
- kde4_add_unit_test(historymanagertest historymanagertest.cpp)
-@@ -25,14 +19,4 @@ target_link_libraries(historymanagertest konq konquerorprivate ${KDE4_KDEUI_LIBS
- kde4_add_unit_test(undomanagertest undomanagertest.cpp)
- target_link_libraries(undomanagertest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
-
--########### konqhtmltest ###############
--
--kde4_add_unit_test(konqhtmltest konqhtmltest.cpp)
--target_link_libraries(konqhtmltest kdeinit_konqueror ${KDE4_KHTML_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
--
--########### konqviewtest ###############
--
--kde4_add_unit_test(konqviewtest konqviewtest.cpp)
--target_link_libraries(konqviewtest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
--
- endif (NOT WIN32)
diff --git a/debian/patches/optional-parts.diff b/debian/patches/optional-parts.diff
new file mode 100644
index 0000000..6954ad1
--- /dev/null
+++ b/debian/patches/optional-parts.diff
@@ -0,0 +1,47 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Make it possible to disable all the components.
+Forwarded: not-needed
+Last-Update: 2017-12-24
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,21 +39,21 @@ if ( KActivities_FOUND )
+ endif ( KActivities_FOUND )
+
+ add_subdirectory( lib )
+-add_subdirectory( dolphin )
+-add_subdirectory( kdialog )
+-add_subdirectory( keditbookmarks )
+-add_subdirectory( konqueror )
+-add_subdirectory( kfind )
++macro_optional_add_subdirectory( dolphin )
++macro_optional_add_subdirectory( kdialog )
++macro_optional_add_subdirectory( keditbookmarks )
++macro_optional_add_subdirectory( konqueror )
++macro_optional_add_subdirectory( kfind )
+ macro_optional_add_subdirectory( plasma )
+-add_subdirectory( konq-plugins )
++macro_optional_add_subdirectory( konq-plugins )
+
+ if ( Q_WS_MAC )
+- add_subdirectory( kdepasswd )
++ macro_optional_add_subdirectory( kdepasswd )
+ endif ( Q_WS_MAC )
+
+ if ( Q_WS_X11 )
+- add_subdirectory( nsplugins )
+- add_subdirectory( kdepasswd )
++ macro_optional_add_subdirectory( nsplugins )
++ macro_optional_add_subdirectory( kdepasswd )
+ endif ( Q_WS_X11 )
+ macro_optional_add_subdirectory( doc )
+
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,3 +1,3 @@
+-add_subdirectory(kfind)
+-add_subdirectory(konqueror)
+-add_subdirectory(kdepasswd)
++macro_optional_add_subdirectory(kfind)
++macro_optional_add_subdirectory(konqueror)
++macro_optional_add_subdirectory(kdepasswd)
diff --git a/debian/patches/series b/debian/patches/series
index bb3cb25..32ced95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
enable_debianabimanager.diff
enable_dlrestrictions.diff
kubuntu_disable-failing-test.diff
-kubuntu_ignore-tests.diff
+optional-parts.diff
diff --git a/debian/rules b/debian/rules
index 75114e4..f2d152b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
override_dh_auto_configure:
- $(overridden_command) -- -DKDE4_BUILD_TESTS=false -DBUILD_plasma=false
+ $(overridden_command) -- -DKDE4_BUILD_TESTS=false -DBUILD_plasma=false -DBUILD_dolphin=false -DBUILD_konqueror=false -DBUILD_konq-plugins=false -DBUILD_nsplugins=false
override_dh_auto_test:
# Disable dh_auto_test at build time
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list