[SCM] kdeclarative packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu2-35-g182494a

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 182494a9b9cb950646d311c01c552fabf5e11d7d
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Dec 1 16:49:53 2015 +0100

    Cleanup++ after merge
---
 debian/control       | 8 +-------
 debian/tests/control | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 50e1d0c..b86438e 100644
--- a/debian/control
+++ b/debian/control
@@ -36,16 +36,10 @@ Description: commandline tool for launching kpackage QML application
 Package: libkf5declarative-dev
 Section: libdevel
 Architecture: any
-<<<<<<< HEAD
-Depends: kio-dev (>= 5.15.0~),
-         libkf5calendarevents5 (= ${binary:Version}),
-         libkf5declarative5 (= ${binary:Version}),
-         libkf5package-dev (>= 5.15.0~),
-=======
 Depends: kio-dev (>= 5.16.0~),
+         libkf5calendarevents5 (= ${binary:Version}),
          libkf5declarative5 (= ${binary:Version}),
          libkf5package-dev (>= 5.16.0~),
->>>>>>> master
          libkf5quickaddons5 (= ${binary:Version}),
          qtbase5-dev (>= 5.4),
          qtdeclarative5-dev (>= 5.4),
diff --git a/debian/tests/control b/debian/tests/control
index 67cb7c9..e55f515 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,14 +1,8 @@
 Tests: testsuite
-<<<<<<< HEAD
-Depends: @builddeps@, build-essential,
+Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, openbox,
          qml-module-qtquick2
-Restrictions: rw-build-tree
-=======
-Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox
 Restrictions: build-needed
->>>>>>> master
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags

-- 
kdeclarative packaging