[SCM] purpose packaging branch, master, updated. 93911a5e9011331040a4f7e46f1105a50f4f238d

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/purpose.git;a=commitdiff;h=93911a5

The following commit has been merged in the master branch:
commit 93911a5e9011331040a4f7e46f1105a50f4f238d
Merge: 5d880e1f317ddc7c3ac1adea01cb05c5fddf9edf d8fce580b35b5e134f277cb689b3c7b2727364cf
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 14 16:32:15 2016 +0100

    merge neon/Neon/unstable

 debian/control | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --cc debian/control
index 17e6650,eccc242..53e94c8
--- a/debian/control
+++ b/debian/control
@@@ -30,8 -30,9 +30,9 @@@ Vcs-Git: https://anonscm.debian.org/git
  Package: libkf5purpose-dev
  Section: libdevel
  Architecture: any
+ Multi-Arch: same
  Depends: libkf5coreaddons-dev (>= 5.7.0~),
 -         libkf5purpose5 (>= 1.1),
 +         libkf5purpose5 (= ${binary:Version}),
           qtbase5-dev (>= 5.2~),
           ${misc:Depends}
  Description: abstraction to provide and leverage actions of a specific kind, devel files
@@@ -46,11 -47,12 +47,13 @@@
  Package: libkf5purpose5
  Architecture: any
  Multi-Arch: same
 -Depends: qml-module-org-kde-kquickcontrolsaddons,
 +Depends: libkf5purpose-bin,
 +         qml-module-org-kde-kquickcontrolsaddons,
           ${misc:Depends},
           ${shlibs:Depends}
- Recommends: qml-module-org-kde-purpose (= ${binary:Version})
+ Conflicts: libkf5purposewidgets5 (<< ${source:Version}~ciBuild)
+ Replaces: libkf5purposewidgets5 (<< ${source:Version}~ciBuild)
+ Recommends: libkf5purpose-bin, qml-module-org-kde-purpose (= ${binary:Version})
  Suggests: kde-telepathy-send-file
  Description: library for abstractions to get the developer's purposes fulfilled
   Framework for providing abstractions to get the developer's purposes fulfilled.

-- 
purpose packaging