[SCM] kdenetwork-filesharing packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.2-0ubuntu1-1-g6670f7c

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenetwork-filesharing.git;a=commitdiff;h=6670f7c

The following commit has been merged in the kubuntu_wily_archive branch:
commit 6670f7cfa9b9f517cac237e7ae00750f8ca33d32
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Oct 14 16:56:36 2015 +0100

    Upstream snapshot for frameworks 5 integration
---
 debian/changelog                      |  6 ++++++
 debian/control                        | 16 ++++++++++------
 debian/kdenetwork-filesharing.install |  4 ++--
 debian/rules                          |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab4e9b7..9fa7fd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdenetwork-filesharing (4:15.10.0+git20151014-0ubuntu1) wily; urgency=medium
+
+  * Upstream snapshot for frameworks 5 integration
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Oct 2015 16:41:12 +0100
+
 kdenetwork-filesharing (4:15.08.2-0ubuntu1) wily; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c454eb9..cf2beeb 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,14 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev (>= 4:4.14),
-               pkg-kde-tools (>= 0.12)
+               kdoctools-dev,
+               kio-dev,
+               libkf5coreaddons-dev,
+               libkf5i18n-dev,
+               libkf5widgetsaddons-dev,
+               libpackagekitqt5-dev,
+               pkg-kde-tools (>= 0.12),
+               qtbase5-dev
 Standards-Version: 3.9.6
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kdenetwork-filesharing.git/
@@ -22,6 +27,7 @@ Package: kdenetwork-filesharing
 Section: net
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: dolphin
 Description: network filesharing configuration module
  This package provides a System Settings panel to configure network
  file-sharing using NFS and Samba.
@@ -32,9 +38,7 @@ Package: kdenetwork-filesharing-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: kde-runtime-dbg,
-         kdenetwork-filesharing (= ${binary:Version}),
-         ${misc:Depends}
+Depends: kdenetwork-filesharing (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for kdenetwork-filesharing
  This package contains debugging files used to investigate problems with
  kdenetwork-filesharing.
diff --git a/debian/kdenetwork-filesharing.install b/debian/kdenetwork-filesharing.install
index 3507e97..2c4a2cf 100644
--- a/debian/kdenetwork-filesharing.install
+++ b/debian/kdenetwork-filesharing.install
@@ -1,2 +1,2 @@
-usr/lib/kde4/sambausershareplugin.so
-usr/share/kde4/services/sambausershareplugin.desktop
+usr/lib/*/qt5/plugins/sambausershareplugin.so
+usr/share/kservices5/sambausershareplugin.desktop
diff --git a/debian/rules b/debian/rules
index 09a31e8..6f36267 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/tmp

-- 
kdenetwork-filesharing packaging