[SCM] KDE Base Applications module packaging branch, master, updated. debian/15.08.1-1-6-g4c0df20

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c1339623ea546e1c6af19f8682ad35a4826d1eec
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Oct 15 02:35:57 2015 +0200

    Move filenamesearch.protocol, and update not-installed
---
 debian/changelog                 |  1 +
 debian/control                   | 13 ++++++++++++-
 debian/dolphin4.install          | 19 +++++++++++++++++++
 debian/kde-baseapps-data.install |  1 -
 debian/not-installed             | 22 ----------------------
 5 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f122b46..cdcd8db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kde-baseapps (4:15.08.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.08.2).
+  * Add the dolphin4 package
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 12 Oct 2015 15:19:36 +0200
 
diff --git a/debian/control b/debian/control
index abbbe8e..c3867e7 100644
--- a/debian/control
+++ b/debian/control
@@ -117,6 +117,17 @@ Description: file search utility
  .
  This package is part of the KDE base applications module.
 
+Package: dolphin4
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kde-baseapps-data (<< 4:15.08.2)
+Replaces: 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: konqueror
 Section: web
 Architecture: any
@@ -127,7 +138,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/dolphin4.install b/debian/dolphin4.install
new file mode 100644
index 0000000..7ff05a9
--- /dev/null
+++ b/debian/dolphin4.install
@@ -0,0 +1,19 @@
+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/kde-baseapps-data.install b/debian/kde-baseapps-data.install
index 49d59d0..d42f421 100644
--- a/debian/kde-baseapps-data.install
+++ b/debian/kde-baseapps-data.install
@@ -18,7 +18,6 @@ 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/filenamesearch.protocol
 usr/share/kde4/services/kcmkonqyperformance.desktop
 usr/share/kde4/services/kcmperformance.desktop
 usr/share/kde4/services/khtml_appearance.desktop
diff --git a/debian/not-installed b/debian/not-installed
index 6267923..a98524d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -21,25 +21,3 @@
 ./usr/lib/libkdeinit4_keditbookmarks.so
 ./usr/lib/libkdeinit4_kfmclient.so
 ./usr/lib/libkdeinit4_konqueror.so
-
-# Dropping dolphin4
-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
-usr/lib/libdolphinprivate4.so.4
-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/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

-- 
KDE Base Applications module packaging