[SCM] Calligra suite packaging branch, master, updated. debian/2.4.2-3-12-g61f408b

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 61f408ba5c73a21e2937c89bb7d627d8f3a6f7db
Author: Pino Toscano <pino at debian.org>
Date:   Mon Aug 6 11:34:56 2012 +0200

    force the "kde" build system to dh_auto_configure
    
    so the proper kdeinit handling is applied
---
 debian/changelog |    2 ++
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4487221..e844b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ calligra (1:2.4.3-2) UNRELEASED; urgency=low
     a buffer overflow in the msword import filter; patch
     upstream_Make-sure-not-to-write-behind-the-allocated-memory.patch.
     (Closes: #684004)
+  * Force the "kde" build system to dh_auto_configure, so the proper kdeinit
+    handling is applied.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Jul 2012 19:05:06 +0200
 
diff --git a/debian/rules b/debian/rules
index 5637a24..2cebfb6 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 -- -DIHAVEPATCHEDQT=ON
+	dh_auto_configure -Skde -- -DIHAVEPATCHEDQT=ON
 
 override_dh_install:
 	dh_install --list-missing

-- 
Calligra suite packaging