[SCM] Calligra suite packaging branch, master, updated. debian/3.0.1+dfsg-2

Pino Toscano pino at moszumanska.debian.org
Wed Sep 6 06:50:40 UTC 2017


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

The following commit has been merged in the master branch:
commit 2460de6986a9726520c43dc5214d5a0e3fa84302
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 20 13:09:02 2017 +0200

    update the flags passed to cmake
    
    - replace -DKDE4_BUILD_TESTS=OFF with -DBUILD_TESTING=OFF, since it is
      the flag exported by ECM
    - remove -DBUILD_krita=OFF, and -DBUILD_kexi=OFF, as both the
      applications were removed upstream
    - add -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON, since for now we want to
      get also what upstream considers unmaintained; maybe this should be
      revised in the future
---
 debian/changelog | 8 ++++++++
 debian/rules     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1dd20dc..b58dbeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,14 @@ calligra (1:3.0.1+dfsg-0r1) UNRELEASED; urgency=medium
     - switch from kde to kf5 dh addon
     - bump the pkg-kde-tools build dependency to >= 0.15.16
   * Switch QT_SELECT to 5 in rules.
+  * Update the flags passed to cmake:
+    - replace -DKDE4_BUILD_TESTS=OFF with -DBUILD_TESTING=OFF, since it is the
+      flag exported by ECM
+    - remove -DBUILD_krita=OFF, and -DBUILD_kexi=OFF, as both the applications
+      were removed upstream
+    - add -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON, since for now we want to
+      get also what upstream considers unmaintained; maybe this should be
+      revised in the future
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Aug 2017 15:51:55 +0200
 
diff --git a/debian/rules b/debian/rules
index 4aaa67f..c7d4f94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export QT_SELECT=5
 	dh $@ --parallel --with kf5
 
 override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- -DKDE4_BUILD_TESTS=OFF -DBUILD_krita=OFF -DBUILD_kexi=OFF -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF
+	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list