[SCM] Calligra suite packaging branch, master, updated. debian/2.6.1-1-31-g396c952

Pino Toscano pino at alioth.debian.org
Wed May 29 13:38:48 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=396c952

The following commit has been merged in the master branch:
commit 396c95281fc5462eceea181d0d9ed9dd9dda478e
Author: Pino Toscano <pino at debian.org>
Date:   Wed May 29 15:38:36 2013 +0200

    manually disable the unit tests
---
 debian/changelog |    2 ++
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 939cb9d..ebb1e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ calligra (1:2.6.3-2) unstable; urgency=low
   * Make calligra-libs break/replace kexi < 1:2.6.1, and raise the
     calligra-data breaks/replaces wrt kexi to the same version (related to
     #704597).
+  * Manually disable the unit tests; they are not enabled by default until
+    kdelibs 4.9, while since 4.10 they are.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 29 May 2013 13:28:12 +0200
 
diff --git a/debian/rules b/debian/rules
index bb08349..80be6e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 	dh $@ --parallel --with kde --with sodeps
 
 override_dh_auto_configure:
-	dh_auto_configure -Skde
+	dh_auto_configure -Skde -- -DKDE4_BUILD_TESTS=OFF
 
 override_dh_install:
 	dh_install --list-missing

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list