[SCM] libqaccessibilityclient packaging branch, master, updated. 14be9febdec82197ae4cfe3b2ef590c3cc50e04b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libqaccessibilityclient.git;a=commitdiff;h=4c60a24

The following commit has been merged in the master branch:
commit 4c60a24da9badd8f39eeb1ab3a43db8d400339b8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 19 09:54:48 2015 +0100

    Add basic autopkgtests support
---
 debian/control                         |  1 +
 debian/libqaccessibilityclient0.acc.in |  2 +-
 debian/rules                           | 10 ----------
 debian/tests/acc                       | 11 +++++++++++
 debian/tests/control                   |  6 ++++++
 debian/tests/testsuite                 |  3 +++
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 0b72262..bf199cd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake, debhelper (>= 9), libqt4-dev, pkg-kde-tools
 Standards-Version: 3.9.6
+XS-Testsuite: autopkgtest
 Homepage: https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/libqaccessibilityclient.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/libqaccessibilityclient.git
diff --git a/debian/libqaccessibilityclient0.acc.in b/debian/libqaccessibilityclient0.acc.in
index af1366c..f5ac9d1 100644
--- a/debian/libqaccessibilityclient0.acc.in
+++ b/debian/libqaccessibilityclient0.acc.in
@@ -10,7 +10,7 @@
 </headers>
 
 <libs>
-    /usr/lib/${DEB_HOST_MULTIARCH}/libqaccessibilityclient.so
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/libqaccessibilityclient.so
 </libs>
 
 </descriptor>
diff --git a/debian/rules b/debian/rules
index c3e21a7..5e5e230 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,3 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	    -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-
-run_dh_acc:
-	# The package needs to be installed (@ in autopkgtest)
-	for in_file in debian/*.acc.in; do \
-	    out_file=$${in_file%.in}; \
-	    sed 's/\$${DEB_HOST_MULTIARCH}/'"$(DEB_HOST_MULTIARCH)"'/' \
-		"$${in_file}" > "$${out_file}"; \
-	done
-
-	dh_acc
diff --git a/debian/tests/acc b/debian/tests/acc
new file mode 100755
index 0000000..f8dc629
--- /dev/null
+++ b/debian/tests/acc
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+for in_file in debian/*.acc.in; do
+    out_file=${in_file%.in}
+    sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \
+        "${in_file}" > "${out_file}"
+done
+
+dh_acc
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..d9b40f1
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,6 @@
+# Tests: testsuite
+# Depends: @, @builddeps@, build-essential
+# 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..dabe645
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+dh_auto_test

-- 
libqaccessibilityclient packaging