[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.11.4

[Modestas Vainius]

The following commit has been merged in the master branch:
commit db3f82ced7328f76c5d2afb07efbb610ddbbd596
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Mar 25 23:42:20 2011 +0200

    qt-kde-team/1: set old kde4 flags before including variables.mk.
    
    Hence some hacks (like DEB_CONFIG_INSTALL_DIR stuff) will work as before.
    (Closes: #618200)
---
 debian/changelog               |    3 +++
 qt-kde-team/1/debian-qt-kde.mk |   22 +++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9bfb97..6bfae2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 pkg-kde-tools (0.11.4) UNRELEASED; urgency=low
 
+  * qt-kde-team/1: set old kde4 flags before including variables.mk hence some
+    hacks (like DEB_CONFIG_INSTALL_DIR stuff) will work as before.
+    (Closes: #618200)
 
  -- Modestas Vainius <modax at debian.org>  Fri, 25 Mar 2011 23:24:21 +0200
 
diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk
index c3c629c..cc82765 100644
--- a/qt-kde-team/1/debian-qt-kde.mk
+++ b/qt-kde-team/1/debian-qt-kde.mk
@@ -26,17 +26,6 @@ DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
 # Our packages are parallel safe
 DEB_BUILD_PARALLEL = yes
 
-# Include default KDE 4 cmake configuration variables
-include $(DEB_PKG_KDE_MAKEFILES)/variables.mk
-
-# Add support for pkgkde-symbolshelper by default
-include $(DEB_PKG_KDE_MAKEFILES)/cdbs/symbolshelper.mk
-
-# Since cmake 2.6.2 or higher is required from now on, enable
-# relative paths to get more ccache hits.
-# NOTE: might not work with vanilla 2.6.2, only with Debian's one.
-DEB_CMAKE_KDE4_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON
-
 # Readd old (<< 0.11.1) flags from the kde4_flags here. Absolute majority of
 # those are kde4libs specific but add them anyway in order to avoid accidental
 # breakage in the old packaging (esp. kde4libs).
@@ -53,6 +42,17 @@ DEB_CMAKE_KDE4_FLAGS += \
     -DSYSCONF_INSTALL_DIR=/etc \
     -DLIBKDEINIT_INSTALL_DIR:PATH=/usr/lib/kde4/libkdeinit
 
+# Include default KDE 4 cmake configuration variables
+include $(DEB_PKG_KDE_MAKEFILES)/variables.mk
+
+# Add support for pkgkde-symbolshelper by default
+include $(DEB_PKG_KDE_MAKEFILES)/cdbs/symbolshelper.mk
+
+# Since cmake 2.6.2 or higher is required from now on, enable
+# relative paths to get more ccache hits.
+# NOTE: might not work with vanilla 2.6.2, only with Debian's one.
+DEB_CMAKE_KDE4_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON
+
 # Pass standard KDE 4 flags to cmake via appropriate CDBS variable
 # (DEB_CMAKE_EXTRA_FLAGS)
 DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS)

-- 
Debian Qt/KDE packaging tools