[SCM] KDE Base Applications module packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-40-gbd88ad6

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=bd88ad6

The following commit has been merged in the kubuntu_wily_archive branch:
commit bd88ad6633c5a6cb6d751c7a607c602cd44f2dc6
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Aug 26 13:45:59 2015 +0100

    Add back dolphin4 package, for use with konqueror
---
 debian/changelog                  |  1 +
 debian/control                    | 11 ++++++++++-
 debian/dolphin.install            | 30 ------------------------------
 debian/dolphin.lintian-overrides  |  1 -
 debian/dolphin4.install           | 20 ++++++++++++++++++++
 debian/dolphin4.lintian-overrides |  1 +
 debian/libkonq5-dev.install       |  2 ++
 debian/not-installed              |  4 ++--
 8 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aed22f2..4f9d663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kde-baseapps (4:15.08.0-0ubuntu1) UNRELEASED; urgency=medium
   [ Jonathan Riddell ]
   * New upstream beta release
   * libkonq5abi1 now libkonq5abi2 due to ABI change
+  * Add back dolphin4 package, for use with konqueror
 
   [ Clive Johnston ]
   * New upstream release
diff --git a/debian/control b/debian/control
index 834c17b..c501a58 100644
--- a/debian/control
+++ b/debian/control
@@ -118,6 +118,15 @@ Description: file search utility
  .
  This package is part of the KDE base applications module.
 
+Package: dolphin4
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+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: konqueror
 Section: web
 Architecture: any
@@ -128,7 +137,7 @@ Depends: install-info,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: konq-plugins (>= 4:4.1~)
-Recommends: dolphin,
+Recommends: dolphin4,
             kfind,
             konqueror-nsplugins (= ${binary:Version}),
             kpart-webkit
diff --git a/debian/dolphin.install b/debian/dolphin.install
deleted file mode 100644
index 7740144..0000000
--- a/debian/dolphin.install
+++ /dev/null
@@ -1,30 +0,0 @@
-usr/bin/dolphin
-usr/bin/servicemenudeinstallation
-usr/bin/servicemenuinstallation
-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/libdolphinprivate.so.4
-usr/lib/libdolphinprivate.so.4.*
-usr/lib/libkdeinit4_dolphin.so
-usr/share/appdata/dolphin.appdata.xml
-usr/share/applications/kde4/dolphin.desktop
-usr/share/doc/kde/HTML/*/dolphin/
-usr/share/kde4/apps/dolphin/dolphinui.rc
-usr/share/kde4/apps/dolphinpart/dolphinpart.rc
-usr/share/kde4/config.kcfg/dolphin_compactmodesettings.kcfg
-usr/share/kde4/config.kcfg/dolphin_detailsmodesettings.kcfg
-usr/share/kde4/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
-usr/share/kde4/config.kcfg/dolphin_generalsettings.kcfg
-usr/share/kde4/config.kcfg/dolphin_iconsmodesettings.kcfg
-usr/share/kde4/config.kcfg/dolphin_versioncontrolsettings.kcfg
-usr/share/kde4/config/servicemenu.knsrc
-usr/share/kde4/services/dolphinpart.desktop
-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/dolphin.lintian-overrides b/debian/dolphin.lintian-overrides
deleted file mode 100644
index 3494e76..0000000
--- a/debian/dolphin.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-dolphin: package-name-doesnt-match-sonames libdolphinprivate4
diff --git a/debian/dolphin4.install b/debian/dolphin4.install
new file mode 100644
index 0000000..5052115
--- /dev/null
+++ b/debian/dolphin4.install
@@ -0,0 +1,20 @@
+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/libdolphinprivate4.so.4.14.11
+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
new file mode 100644
index 0000000..161e593
--- /dev/null
+++ b/debian/dolphin4.lintian-overrides
@@ -0,0 +1 @@
+dolphin4: package-name-doesnt-match-sonames libdolphinprivate4
diff --git a/debian/libkonq5-dev.install b/debian/libkonq5-dev.install
index 55ed353..8972694 100644
--- a/debian/libkonq5-dev.install
+++ b/debian/libkonq5-dev.install
@@ -10,6 +10,8 @@ usr/include/konq_popupmenu.h
 usr/include/konq_popupmenuinformation.h
 usr/include/konq_popupmenuplugin.h
 usr/include/konqmimedata.h
+usr/include/kversioncontrolplugin.h
+usr/include/kversioncontrolplugin2.h
 usr/include/libkonq_export.h
 usr/lib/libkonq.so
 usr/share/dbus-1/interfaces/org.kde.FavIcon.xml
diff --git a/debian/not-installed b/debian/not-installed
index b1fa625..e355797 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,9 +1,9 @@
 # Symlinks of private libraries
 ./usr/lib/libkbookmarkmodel_private.so
-./usr/lib/libdolphinprivate.so
+./usr/lib/libdolphinprivate4.so
 
 #is installed then moved by dh_initthing
-./usr/lib/libkdeinit4_dolphin.so
+./usr/lib/libkdeinit4_dolphin4.so
 
 # Only for deveploment and we are not shipping any kdebase-dev
 ./usr/share/dbus-1/interfaces/org.kde.Konqueror.Main.xml

-- 
KDE Base Applications module packaging