[SCM] Amarok packaging branch, master, updated. debian/2.7.1-1-3-gb41161f
Modestas Vainius
modax at alioth.debian.org
Thu Jun 6 19:21:03 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=b41161f
The following commit has been merged in the master branch:
commit b41161f7450a2998c5195c8451fcac9d4550e892
Author: Modestas Vainius <modax at debian.org>
Date: Thu Jun 6 22:20:20 2013 +0300
Disable test building explicitly.
Tests are enabled by default since KDE 4.9 so they will trigger FTBFS. We are
not quite there yet with amarok tests.
---
debian/changelog | 3 +++
debian/rules | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8a2fa06..56f7aad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ amarok (2.7.1-2) UNRELEASED; urgency=low
* Drop libifp-dev and libnjb-dev build dependencies. Apparently, they have
been unused since initial Amarok 2 release. Thanks to Pino Toscano for
heads up.
+ * Disable test building explicitly. Tests are enabled by default since
+ KDE 4.9 so they will trigger FTBFS. We are not quite there yet with amarok
+ tests.
-- Modestas Vainius <modax at debian.org> Sun, 02 Jun 2013 20:08:09 +0300
diff --git a/debian/rules b/debian/rules
index bf8d02a..f104c6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ ifeq (alpha,$(shell dpkg-architecture -qDEB_HOST_ARCH))
endif
override_dh_auto_configure:
- dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON
+ dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON -DKDE4_BUILD_TESTS=false
override_dh_bugfiles:
dh_bugfiles -A
--
Amarok packaging
More information about the pkg-kde-commits
mailing list