[SCM] dolphin packaging branch, kubuntu_stable, updated. 89a0c24471734abd55c46b7db47ace4ed4e29883

Harald Sitter apachelogger-guest at moszumanska.debian.org
Wed Aug 19 09:04:03 UTC 2015


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

The following commit has been merged in the kubuntu_stable branch:
commit 89a0c24471734abd55c46b7db47ace4ed4e29883
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 19 11:03:56 2015 +0200

    properly split dolphin
    
    - libdolphinvcs5: used by dolphin-plugins to provide vcs plugins
    - libdolphinvcs-dev: dev headers
    - dolphin-dev: dbus interface xml for fd.org interface (not installed by
      anything else)
    - add not-installed for presently bogus .so symlink
    - lintian override bogus warnings
    - breaks and replaces accordingly
---
 debian/control                   | 36 +++++++++++++++++++++++++++++++++++-
 debian/dolphin-dev.install       |  1 +
 debian/dolphin.install           | 21 +++++++++++++++++++--
 debian/dolphin.lintian-overrides |  2 ++
 debian/libdolphinvcs-dev.install |  9 +++++++++
 debian/libdolphinvcs5.install    |  2 ++
 debian/not-installed             |  2 ++
 7 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9de2b18..cba6b28 100644
--- a/debian/control
+++ b/debian/control
@@ -58,11 +58,45 @@ Description: file manager
    Undo/redo functionality
    Ratings, comments, and tags
 
+Package: dolphin-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: dolphin (<< 4:15.07.90+git20150819.0900)
+Replaces: dolphin (<< 4:15.07.90+git20150819.0900)
+Description: file manager - development files
+ Contains DBus interface XML files to access dolphin via the DBus
+ org.freedesktop.FileManager1 interface.
+
+Package: libdolphinvcs-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libdolphinvcs5 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: dolphin (<< 4:15.07.90+git20150819.0900)
+Replaces: dolphin (<< 4:15.07.90+git20150819.0900)
+Description: library to show version control in Dolphin - development files
+ This library enables developers to expand Dolphin with the ability to show
+ version control status in directories that are version controlled.
+
+Package: libdolphinvcs5
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: dolphin (<< 4:15.07.90+git20150819.0900)
+Replaces: dolphin (<< 4:15.07.90+git20150819.0900)
+Description: library to show version control in Dolphin
+ This library enables developers to expand Dolphin with the ability to show
+ version control status in directories that are version controlled.
+
 Package: dolphin-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: dolphin, ${misc:Depends}
+Depends: dolphin (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for Dolphin
  This package contains debugging files used to investigate problems
  with binaries included Dolphin
diff --git a/debian/dolphin-dev.install b/debian/dolphin-dev.install
new file mode 100644
index 0000000..c161d5b
--- /dev/null
+++ b/debian/dolphin-dev.install
@@ -0,0 +1 @@
+usr/share/dbus-1/interfaces/org.freedesktop.FileManager1.xml
diff --git a/debian/dolphin.install b/debian/dolphin.install
index 7c0337f..b1f225b 100644
--- a/debian/dolphin.install
+++ b/debian/dolphin.install
@@ -1,2 +1,19 @@
-etc/
-usr/
+etc/xdg/servicemenu.knsrc
+usr/bin/dolphin
+usr/bin/servicemenudeinstallation
+usr/bin/servicemenuinstallation
+usr/lib/*/libdolphinprivate.so.*
+usr/lib/*/libkdeinit5_dolphin.so
+usr/lib/*/qt5/plugins/dolphinpart.so
+usr/lib/*/qt5/plugins/kcm_dolphingeneral.so
+usr/lib/*/qt5/plugins/kcm_dolphinnavigation.so
+usr/lib/*/qt5/plugins/kcm_dolphinservices.so
+usr/lib/*/qt5/plugins/kcm_dolphinviewmodes.so
+usr/share/appdata/dolphin.appdata.xml
+usr/share/applications/org.kde.dolphin.desktop
+usr/share/config.kcfg/
+usr/share/dbus-1/services/org.kde.dolphin.FileManager1.service
+usr/share/doc/
+usr/share/kservices5/
+usr/share/kservicetypes5/
+usr/share/kxmlgui5/
diff --git a/debian/dolphin.lintian-overrides b/debian/dolphin.lintian-overrides
new file mode 100644
index 0000000..e7ad1ee
--- /dev/null
+++ b/debian/dolphin.lintian-overrides
@@ -0,0 +1,2 @@
+dolphin: package-name-doesnt-match-sonames libdolphinprivate5 libkdeinit5-dolphin
+dolphin: shlib-without-versioned-soname usr/lib/*/libkdeinit5_dolphin.so libkdeinit5_dolphin.so
diff --git a/debian/libdolphinvcs-dev.install b/debian/libdolphinvcs-dev.install
new file mode 100644
index 0000000..35776af
--- /dev/null
+++ b/debian/libdolphinvcs-dev.install
@@ -0,0 +1,9 @@
+usr/include/Dolphin/KVersionControlPlugin
+usr/include/Dolphin/dolphinvcs_version.h
+usr/include/Dolphin/kversioncontrolplugin.h
+usr/include/dolphin_export.h
+usr/lib/*/cmake/DolphinVcs/DolphinVcsConfig.cmake
+usr/lib/*/cmake/DolphinVcs/DolphinVcsConfigVersion.cmake
+usr/lib/*/cmake/DolphinVcs/DolphinVcsTargets-debian.cmake
+usr/lib/*/cmake/DolphinVcs/DolphinVcsTargets.cmake
+usr/lib/*/libdolphinvcs.so
diff --git a/debian/libdolphinvcs5.install b/debian/libdolphinvcs5.install
new file mode 100644
index 0000000..bd912cd
--- /dev/null
+++ b/debian/libdolphinvcs5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libdolphinvcs.so.15.*
+usr/lib/*/libdolphinvcs.so.5
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..bcf200f
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+# https://git.reviewboard.kde.org/r/124812/
+./usr/lib/*/libdolphinprivate.so

-- 
dolphin packaging



More information about the pkg-kde-commits mailing list