[SCM] kio packaging branch, kubuntu_vivid_archive, updated. 1a0dbb9eb42a38e16d595269a60022fa9e772bdf

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 1a0dbb9eb42a38e16d595269a60022fa9e772bdf
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Feb 13 14:47:57 2015 +0100

    make sure own packages are installed
    
    this in particular should make slave tests pass as expected.
    KProtocolFactory internally has a fallback mechanism trying to look up
    protocol definitions via XDG paths. This however only works when there
    actually is something installed. So, ideally we want everything installed
    such that fallbacks like these can take effect and avoid test failures
    from failing to lookup runtime assets.
---
 debian/changelog     | 8 ++++++++
 debian/tests/control | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 79f46ad..6ed78c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kio (5.7.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Make sure autopkgtest pulls in own binary packages as Depends
+    such that data asset lookup (e.g. protocol configs) can be
+    found more reliably
+
+ -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 14:47:22 +0100
+
 kio (5.7.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/tests/control b/debian/tests/control
index e7fde3c..53e743e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: testsuite
-Depends: @builddeps@, build-essential,
+Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, openbox
 Restrictions: rw-build-tree

-- 
kio packaging