[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-4-10-gae7feaa

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 96d33be1cdb600580933cbab3caa5b08531bb094
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 22 12:51:05 2017 +0200

    disable not-shipped developer tools
---
 debian/changelog     | 4 ++++
 debian/not-installed | 5 -----
 debian/rules         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9680da..446bf42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,10 @@ calligra (1:2.9.11+dfsg1-1) UNRELEASED; urgency=medium
     - libjpeg-dev: no more needed because of previous changes
   * Drop all the koffice & pre-Jessie conflicts/replaces/breaks.
   * Update watch file.
+  * Disable the build of developer tools, which were not installed already
+    in any binary package anyway:
+    - pass -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF to cmake
+    - remove from debian/not-installed files now disappeared
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jun 2017 20:54:16 +0200
 
diff --git a/debian/not-installed b/debian/not-installed
index 13c470c..18b4add 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,7 +1,2 @@
 # fonts already in fonts-lyx package
 ./usr/share/kde4/apps/formulashape/fonts/cmex10.ttf
-
-# add dependency on karbon, words and sheets to calligra-libs; too generic
-./usr/bin/cstester
-./usr/bin/cstrunner
-./usr/bin/visualimagecompare
diff --git a/debian/rules b/debian/rules
index 88ceabb..50b0793 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 	dh $@ --parallel --with kde
 
 override_dh_auto_configure:
-	dh_auto_configure -Skde -- -DKDE4_BUILD_TESTS=OFF -DBUILD_krita=OFF -DBUILD_kexi=OFF
+	dh_auto_configure -Skde -- -DKDE4_BUILD_TESTS=OFF -DBUILD_krita=OFF -DBUILD_kexi=OFF -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Calligra suite packaging