[SCM] kconfig packaging branch, master, updated. debian/5.37.0-2-99-ga0d64c3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 811638671951081662dfa62478fc214b0c2d47f4
Merge: 2bcc2e110e899f33a9bc9f556ffc9336af2c154b fc152ab5b01a109cb332e39d605956a5bfb05c7a
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Nov 11 11:52:12 2016 +0100

    Merge branch 'Neon/release' into Neon/unstable
    
    # Conflicts:
    #	debian/tests/control

 debian/tests/control            | 2 +-
 debian/tests/testsuite.xsession | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --cc debian/tests/control
index 9f0ee88,a8923a3..753e096
--- a/debian/tests/control
+++ b/debian/tests/control
@@@ -1,6 -1,6 +1,6 @@@
  Tests: testsuite
  Depends: @, @builddeps@, build-essential,
-          xvfb, xauth, dbus (>= 1.8), kinit
 -         xvfb, xauth, dbus-x11
++         xvfb, xauth, dbus-x11 (>= 1.8)
  Restrictions: build-needed, allow-stderr
  
  Tests: acc

-- 
kconfig packaging