[SCM] Calligra suite packaging branch, experimental, updated. debian/2.9.11+dfsg1-1-24-g292f586

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 9e5dac6c775dd9f27f57c69df1ec0e07e263bd30
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 20 13:05:18 2017 +0200

    use the right dh addon
    
    - switch from kde to kf5 dh addon
    - bump the pkg-kde-tools build dependency to >= 0.15.16
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 debian/rules     | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 050a640..018603e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ calligra (1:3.0.1+dfsg-0r1) UNRELEASED; urgency=medium
   * Disable the okular-backend-odp, and okular-backend-odt binaries, since
     there is no KF5 version of Okular in Debian currently
     - comment out the okular-dev build dependency
+  * Use the right dh addon:
+    - switch from kde to kf5 dh addon
+    - bump the pkg-kde-tools build dependency to >= 0.15.16
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Aug 2017 15:51:55 +0200
 
diff --git a/debian/control b/debian/control
index 39beb7b..af9fadb 100644
--- a/debian/control
+++ b/debian/control
@@ -78,7 +78,7 @@ Build-Depends: cmake,
                libxml2-dev,
 #               okular-dev,
                pkg-config,
-               pkg-kde-tools,
+               pkg-kde-tools (>= 0.15.16),
                pstoedit,
                qtbase5-dev (>= 5.3.0),
                shared-mime-info,
diff --git a/debian/rules b/debian/rules
index 322967c..af638e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,10 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 export QT_SELECT=4
 
 %:
-	dh $@ --parallel --with kde
+	dh $@ --parallel --with kf5
 
 override_dh_auto_configure:
-	dh_auto_configure -Skde -- -DKDE4_BUILD_TESTS=OFF -DBUILD_krita=OFF -DBUILD_kexi=OFF -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF
+	dh_auto_configure -Skf5 -- -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