[SCM] kdenetwork-filesharing packaging branch, kubuntu_wily_backports, updated. ubuntu/4%15.08.2-0ubuntu1-4-g7bd14be

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 7bd14bed07388fc2c11fbb88a317ed8455a176f9
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 16:39:37 2015 +0000

    This series is still qt4. Update packaging to prior state.
    
    * This series is still qt4. Update packaging to prior state.
    * Vivid backport
    * Fix changelog.
    * PPA build
---
 debian/changelog                      | 43 +++++++----------------------------
 debian/control                        | 18 ++++++---------
 debian/kdenetwork-filesharing.install |  4 ++--
 debian/rules                          |  2 +-
 debian/watch                          |  1 +
 5 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0409bc0..1657bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,45 +1,18 @@
-kdenetwork-filesharing (4:15.08.3-0ubuntu1) UNRELEASED; urgency=medium
+kdenetwork-filesharing (15.08.3-0ubuntu1) UNRELEASED; urgency=medium
 
-  * Take out the snapshot for a backport release. 
-  * New upstream bugfix release
+  * This series is still qt4. Update packaging to prior state. 
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Nov 2015 16:05:10 -0800
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 16:37:55 +0000
 
-kdenetwork-filesharing (4:15.08.2-0ubuntu1) wily; urgency=medium
+kdenetwork-filesharing (4:15.08.2-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:18:45 +0100
-
-kdenetwork-filesharing (4:15.08.1-0ubuntu1) wily; urgency=medium
-
-  * New upstream release (15.08.1)
-
- -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 16:41:55 +0100
-
-kdenetwork-filesharing (4:15.08.0-0ubuntu1) wily; urgency=medium
-
-  * new upstream release
-
- -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:22:19 +0100
-
-kdenetwork-filesharing (4:15.07.90-0ubuntu1) wily; urgency=medium
-
-  * new upstream beta release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 09:46:08 +0100
-
-kdenetwork-filesharing (4:15.04.2-0ubuntu1) wily; urgency=medium
-
-  [ Scarlett Clark ]
-  * New upstream release
   * Fix kdelibs version. 
-  * New upstream release
-
-  [ Jonathan Riddell ]
-  * New upstream release
+  * Vivid backport
+  * Fix changelog. 
+  * PPA build
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:52:46 +0200
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 04 Nov 2015 05:27:31 +0000
 
 kdenetwork-filesharing (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index cf2beeb..13723f1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,15 +10,10 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kdoctools-dev,
-               kio-dev,
-               libkf5coreaddons-dev,
-               libkf5i18n-dev,
-               libkf5widgetsaddons-dev,
-               libpackagekitqt5-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev
-Standards-Version: 3.9.6
+               kde-sc-dev-latest (>= 4:4.12),
+               kdelibs5-dev (>= 4:4.14),
+               pkg-kde-tools (>= 0.12)
+Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kdenetwork-filesharing.git/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kdenetwork-filesharing.git
@@ -27,7 +22,6 @@ 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.
@@ -38,7 +32,9 @@ Package: kdenetwork-filesharing-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: kdenetwork-filesharing (= ${binary:Version}), ${misc:Depends}
+Depends: kde-runtime-dbg,
+         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 2c4a2cf..3507e97 100644
--- a/debian/kdenetwork-filesharing.install
+++ b/debian/kdenetwork-filesharing.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt5/plugins/sambausershareplugin.so
-usr/share/kservices5/sambausershareplugin.desktop
+usr/lib/kde4/sambausershareplugin.so
+usr/share/kde4/services/sambausershareplugin.desktop
diff --git a/debian/rules b/debian/rules
index 6f36267..09a31e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/tmp
diff --git a/debian/watch b/debian/watch
index 7bfe701..6c5cca6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
 http://download.kde.org/stable/applications/([\d.]+)/src/kdenetwork-filesharing-([\d.]+).tar.xz
+
 http://download.kde.org/unstable/applications/([\d.]+)/src/kdenetwork-filesharing-([\d.]+).tar.xz

-- 
kdenetwork-filesharing packaging