[SCM] akonadi-mime packaging branch, master, updated. 08ba25e223a803c7ee90edfb5577d12e0fdf2056

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-mime.git;a=commitdiff;h=21054b8

The following commit has been merged in the master branch:
commit 21054b8f793132091f217bf824acd4ab83305f23
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Aug 30 13:19:22 2016 +0200

    Minor changes
    
    Gbp-Dch: Ignore
---
 debian/copyright                | 4 ++--
 debian/rules                    | 1 +
 debian/source/lintian-overrides | 1 -
 debian/tests/control            | 2 +-
 debian/tests/testsuite          | 2 +-
 debian/tests/testsuite.xsession | 4 ----
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e7a14d4..ff44a3f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: kdepimlibs
-Source: git://anongit.kde.org/kdepimlibs
+Upstream-Name: akonadi-mime
+Source: git://anongit.kde.org/akonadi-mime
 Comment: Numerous people, too many to count, have contributed to kdepimlibs as
  a whole. The KDE project tries to make an extensive list of people who
  contributed to KDE at http://www.kde.org/people/credits/
diff --git a/debian/rules b/debian/rules
index b5a9dc2..9ca54cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,4 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time
+	:
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 75dfbb5..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kdepimlibs source: dbg-package-missing-depends kdepimlibs-dbg
diff --git a/debian/tests/control b/debian/tests/control
index f72461b..c2df602 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 # Tests: testsuite
 # Depends: @, @builddeps@, build-essential,
-#          xvfb, xauth, dbus-x11, akonadi-server, oxygen-icon-theme,
+#          xvfb, xauth, dbus (>= 1.8), akonadi-server, oxygen-icon-theme,
 #          libqt5sql5-sqlite, akonadi-backend-sqlite
 # Restrictions: build-needed
 
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index fa0feb1..f0de31b 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    dbus-run-session -- debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 7e49196..35976a5 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,8 +1,4 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-kdeinit4
 dh_auto_test
-ret=$?
-kdeinit4_shutdown
-exit $ret

-- 
akonadi-mime packaging