[SCM] baloo packaging branch, master, updated. ubuntu/5.13.0-0ubuntu1-90-g484cab4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 081141c347e19b854e1ca6e097d31d9adcd1c78c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Sep 14 17:45:41 2014 +0200

    Merge dh_acc test into testsuite.
---
 debian/changelog       | 1 +
 debian/tests/acc       | 3 ---
 debian/tests/control   | 6 ++----
 debian/tests/testsuite | 4 ++++
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1a9e50..a3bb7c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 baloo (4:4.14.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.14.1).
+  * Merge dh_acc test into testsuite.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 20:10:30 +0200
 
diff --git a/debian/tests/acc b/debian/tests/acc
deleted file mode 100755
index ecd74f2..0000000
--- a/debian/tests/acc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-dh_acc
diff --git a/debian/tests/control b/debian/tests/control
index d67a568..0991c73 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,8 +2,6 @@ Tests: testsuite
 Depends: @, @builddeps@,
          xvfb, xauth, dbus-x11,
          libqt4-sql-sqlite,
-         kdelibs5-plugins
+         kdelibs5-plugins,
+         dh-acc, exuberant-ctags
 Restrictions: build-needed
-
-Tests: acc
-Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index fa0feb1..9ae2350 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -2,3 +2,7 @@
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     dbus-launch --exit-with-session debian/tests/testsuite.xsession
+ret=$?
+if [ $ret -eq 0 ]; then
+    dh_acc
+fi

-- 
baloo packaging