[SCM] kscreenlocker packaging branch, kubuntu_unstable, updated. 08df0a5575d38d167c8ceb9ad5c7c749bc254de1
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Mon Nov 9 23:02:36 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreenlocker.git;a=commitdiff;h=08df0a5
The following commit has been merged in the kubuntu_unstable branch:
commit 08df0a5575d38d167c8ceb9ad5c7c749bc254de1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Mon Nov 9 15:02:27 2015 -0800
Clean up tests. Disable tests at buildtime.
---
debian/changelog | 1 +
debian/rules | 3 +++
debian/tests/acc | 11 -----------
debian/tests/control | 2 --
4 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1b9112..37824e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kscreenlocker (5.4.2-alpha-0ubuntu1) UNRELEASED; urgency=medium
* Add some descriptions.
* Add XtestSuite.
* Add test files.
+ * Clean up tests. Disable tests at buildtime.
-- Scarlett Clark <sgclark at kubuntu.org> Mon, 09 Nov 2015 13:14:34 -0800
diff --git a/debian/rules b/debian/rules
index a771782..d294af4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,3 +5,6 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
%:
dh $@ --dbg-package=kscreenlocker-dbg
+override_dh_auto_test:
+ # Disable dh_auto_test at build time
+ :
\ No newline at end of file
diff --git a/debian/tests/acc b/debian/tests/acc
deleted file mode 100755
index f8dc629..0000000
--- a/debian/tests/acc
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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
index 9a7b849..dcb37cd 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -4,5 +4,3 @@ Depends: @, @builddeps@, build-essential,
kded5, libkf5service-bin
Restrictions: rw-build-tree
-Tests: acc
-Depends: @, dh-acc, exuberant-ctags
--
kscreenlocker packaging
More information about the pkg-kde-commits
mailing list