[SCM] kdeconnect packaging branch, master, updated. upstream/0.8-54-g7c3f373

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=7c3f373

The following commit has been merged in the master branch:
commit 7c3f3733f1db1715ea38b460726603d6b7279098
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Feb 4 22:12:33 2016 -0300

    Switch to KF5.
---
 debian/changelog |  6 ++++++
 debian/control   | 26 ++++++++++++++++++--------
 debian/rules     |  7 ++++---
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48186c1..ec97356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ kdeconnect (0.9g-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Switch to KF5.
+    - Remove all Qt4/Plasma 4 related packages from build dpendencies and
+      dependencies.
+    - Add new build dependencies and dependencies as required. Thanks to the
+      Ubuntu folks for they work! I have taken most of the correct build deps
+      names from your packaging.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 01 Feb 2016 17:49:26 -0300
 
diff --git a/debian/control b/debian/control
index 0b47523..3fc7b7f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,23 @@ Priority: optional
 Maintainer: David Suárez <david.sephirot at gmail.com>
 Build-Depends: cmake,
                debhelper (>= 9.0.0),
-               kdelibs5-dev,
-               libqca2-dev,
-               libqca2-plugin-ossl,
-               libqjson-dev,
+               extra-cmake-modules,
+               kio-dev,
+               kwayland-dev,
+               libfakekey-dev,
+               libkf5configwidgets-dev,
+               libkf5dbusaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kcmutils-dev,
+               libkf5notifications-dev,
+               libqca-qt5-2-dev,
+               libqt5x11extras5-dev,
                libxtst-dev,
+               pkg-config,
                pkg-kde-tools,
-               libfakekey-dev,
-               libdbus-1-dev
+               qtbase5-dev,
+               qtdeclarative5-dev
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/playground/base/kdeconnect-kde
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kdeconnect.git
@@ -19,8 +28,9 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/kdeconnect.git
 
 Package: kdeconnect
 Architecture: any
-Depends: libqca2,
-         libqca2-plugins,
+Depends: kde-cli-tools,
+         libqca-qt5-2-plugins,
+         plasma-workspace,
          sshfs,
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index dd156c5..2d08d67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,12 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 # workaround for hardening on cmake
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 %:
-	dh $@ --with kde
+	dh $@ --with=kf5,pkgkde-symbolshelper --parallel
 
 override_dh_auto_install:
 	dh_auto_install

-- 
kdeconnect packaging