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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 3b9a8e4b7ccc473baf97f705ddf8d5fa693b96fa
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Mar 11 20:24:48 2011 +0200

    Remove most of flags from kde4_flags (used by kde.pm and variables.mk).
    
    Move most of kde4_flags to qt-kde-team/1/debian-qt-kde.mk as absolute majority
    of them are kde4libs specific anyway. This is done in order to avoid cmake
    2.8.4 warnings about unused variables and unnecessary duplication of
    configuration.
---
 datalib/kde4_flags             |   11 -----------
 debian/changelog               |    4 ++++
 qt-kde-team/1/debian-qt-kde.mk |   16 ++++++++++++++++
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/datalib/kde4_flags b/datalib/kde4_flags
index 93f1b24..55cf51c 100644
--- a/datalib/kde4_flags
+++ b/datalib/kde4_flags
@@ -1,13 +1,2 @@
 -DCMAKE_BUILD_TYPE=Debian
--DKDE4_BUILD_TESTS=false
--DKDE_DISTRIBUTION_TEXT="Debian packages"
--DCMAKE_SKIP_RPATH:BOOL=OFF
--DKDE4_USE_ALWAYS_FULL_RPATH=false
--DCONFIG_INSTALL_DIR=/usr/share/kde4/config
--DDATA_INSTALL_DIR=/usr/share/kde4/apps
--DHTML_INSTALL_DIR=/usr/share/doc/kde/HTML
--DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg
--DLIB_INSTALL_DIR=/usr/lib
--DSYSCONF_INSTALL_DIR=/etc
--DLIBKDEINIT_INSTALL_DIR:PATH=/usr/lib/kde4/libkdeinit
 -DENABLE_LIBKDEINIT_RUNPATH:BOOL=ON
diff --git a/debian/changelog b/debian/changelog
index 6e368dc..39f988b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 pkg-kde-tools (0.11.1) UNRELEASED; urgency=low
 
+  * Move most of kde4_flags to qt-kde-team/1/debian-qt-kde.mk as absolute
+    majority of them are kde4libs specific anyway. This is done in order to
+    avoid cmake 2.8.4 warnings about unused variables and unnecessary
+    duplication of configuration.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 11 Mar 2011 14:20:37 +0200
 
diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk
index 3ed6029..c3c629c 100644
--- a/qt-kde-team/1/debian-qt-kde.mk
+++ b/qt-kde-team/1/debian-qt-kde.mk
@@ -37,6 +37,22 @@ include $(DEB_PKG_KDE_MAKEFILES)/cdbs/symbolshelper.mk
 # 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).
+DEB_CMAKE_KDE4_FLAGS += \
+    -DKDE4_BUILD_TESTS=false \
+    -DKDE_DISTRIBUTION_TEXT="Debian packages" \
+    -DCMAKE_SKIP_RPATH:BOOL=OFF \
+    -DKDE4_USE_ALWAYS_FULL_RPATH=false \
+    -DCONFIG_INSTALL_DIR=/usr/share/kde4/config \
+    -DDATA_INSTALL_DIR=/usr/share/kde4/apps \
+    -DHTML_INSTALL_DIR=/usr/share/doc/kde/HTML \
+    -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
+    -DLIB_INSTALL_DIR=/usr/lib \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIBKDEINIT_INSTALL_DIR:PATH=/usr/lib/kde4/libkdeinit
+
 # 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