[SCM] Akonadi packaging branch, master, updated. debian/1.10.3-1-17-gaaac9b2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=238f4d3

The following commit has been merged in the master branch:
commit 238f4d38a57c4c8c0642e5b778f2e1721a3be964
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Dec 12 12:49:23 2013 -0300

    Run auto tests with autopkgtests.
---
 debian/changelog       |  2 --
 debian/control         |  4 +---
 debian/rules           |  8 +-------
 debian/tests/acc       |  3 +++
 debian/tests/control   | 22 ++++++++++++++++++++++
 debian/tests/testsuite |  4 ++++
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b693205..9b7f55e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,9 @@ akonadi (1.11.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Update build dependencies.
   * Update subst var for akonadi-backend-mysql.
-  * Add libxml2-utils to the build deps, to be used in the tests.
   * Bump Standards-Version to 3.9.5, no changes needed.
   * New upstream patch: dont_do_redundant_flag_changes.diff
   * New upstream patch: always_verify_writing_data_to_external_file.diff
-  * Add dbus-x11 to launch dbus tests.
   * Update symbols file.
   * Update install files.
 
diff --git a/debian/control b/debian/control
index 5457db0..57dcb88 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.8.8), automoc,
  libqt4-dev (>= 4:4.8.0), shared-mime-info (>= 0.20), libmysqlclient-dev,
  libxslt-dev, libsoprano-dev (>= 2.7.56), xsltproc, libdbus-1-dev,
  libboost-program-options-dev,
- libsqlite3-dev (>= 3.6.23), mysql-server-core, libxml2-utils,
- xvfb, xauth, dbus-x11,
- dh-acc, exuberant-ctags
+ libsqlite3-dev (>= 3.6.23), mysql-server-core
 Standards-Version: 3.9.5
 Homepage: http://pim.kde.org/akonadi
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/akonadi.git
diff --git a/debian/rules b/debian/rules
index 79c0a55..f43b355 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 export DEB_CFLAGS_MAINT_APPEND += -fvisibility=hidden -fvisibility-inlines-hidden
 export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidden
 
-dh := --with acc
-
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
@@ -28,8 +26,4 @@ override_dh_strip:
 	$(overridden_command) --dbg-package=akonadi-dbg
 
 override_dh_auto_test:
-	[ -x $(CURDIR)/debian/tmp/home ] || \
-	    mkdir -p $(CURDIR)/debian/tmp/home
-	HOME=$(CURDIR)/debian/tmp/home \
-	     xvfb-run dbus-launch --exit-with-session $(overridden_command)
-	rm -rf $(CURDIR)/debian/tmp/home
+	# Avoid tests extra build dependencies, check them with autopkgtests
diff --git a/debian/tests/acc b/debian/tests/acc
new file mode 100755
index 0000000..ecd74f2
--- /dev/null
+++ b/debian/tests/acc
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+dh_acc
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..c798811
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,22 @@
+Tests: testsuite
+Depends: @, build-essential,
+         debhelper (>= 9),
+         cmake (>= 2.8.8),
+         automoc,
+         pkg-kde-tools (>= 0.12),
+         libqt4-dev (>= 4:4.8.0),
+         shared-mime-info (>= 0.20),
+         libmysqlclient-dev,
+         libxslt-dev,
+         libsoprano-dev (>= 2.7.56),
+         xsltproc,
+         libdbus-1-dev,
+         libboost-program-options-dev,
+         libsqlite3-dev (>= 3.6.23),
+         mysql-server-core,
+         xvfb, xauth, dbus-x11, libxml2-utils
+Restrictions: build-needed
+
+Tests: acc
+Depends: @,
+         dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100755
index 0000000..0163b18
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+mkdir -p ${ADTTMP}/home
+HOME=${ADTTMP}/home xvfb-run dbus-launch --exit-with-session dh_auto_test

-- 
Akonadi packaging