[SCM] akonadi-contacts packaging branch, master, updated. 9476553c5c4f01854529fb3dc30d57881bac2e36

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c039440f201a66ed9ab2eb9072ab697acb4e0f68
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Aug 31 13:14:50 2016 +0200

    Minor changes
    
    Gbp-Dch: Ignore
---
 debian/control                  | 4 ++--
 debian/rules                    | 1 +
 debian/tests/control            | 2 +-
 debian/tests/testsuite          | 2 +-
 debian/tests/testsuite.xsession | 4 ----
 debian/upstream/metadata        | 8 ++++----
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index b8619e3..4a76983 100644
--- a/debian/control
+++ b/debian/control
@@ -100,6 +100,6 @@ Replaces: kdepimlibs-data,
           libkf5akonadimime5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadisocialutils5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000)
-Description: akonadi-contact data files
+Description: Akonadi contacts access library - data files
  This package contains data files for all libraries that are part of
- akonadi-contact.
+ akonadi-contacts.
diff --git a/debian/rules b/debian/rules
index edd5e8b..b3a0e50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ 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
+	:
 
 override_dh_makeshlibs:
 	$(overridden_command) -Xkcm_akonadicontact_actions.so
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
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 6979309..79a2540 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,7 +1,7 @@
-Name: kdepimlibs
-Changelog: https://quickgit.kde.org/?p=kdepimlibs.git&a=log
+Name: akonadi-contacts
+Changelog: https://quickgit.kde.org/?p=akonadi-contacts.git&a=log
 Contact: kde-devel at kde.org
 Donation: https://www.kde.org/community/donations/index.php
-Repository: https://anongit.kde.org/kdepimlibs.git
-Repository-Browse: https://quickgit.kde.org/?p=kdepimlibs.git
+Repository: https://anongit.kde.org/akonadi-contacts.git
+Repository-Browse: https://quickgit.kde.org/?p=akonadi-contacts.git
 Security-Contact: security at kde.org

-- 
akonadi-contacts packaging