[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2+squeeze1-119-g8489bf3
Modestas Vainius
modax at alioth.debian.org
Sun Mar 27 17:43:04 UTC 2011
The following commit has been merged in the master branch:
commit 99eaceeed24445a679b31a00992a96ecd5018953
Author: Modestas Vainius <modax at debian.org>
Date: Sun Mar 27 16:41:59 2011 +0300
Pass required kdelibs cmake flags to dh_auto_configure.
qt-kde-team/2/debian-qt-kde.mk no longer passes them implicitly.
---
debian/changelog | 2 ++
debian/rules | 12 ++++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5651528..1551441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ kde4libs (4:4.6.1-0r2) UNRELEASED; urgency=low
* Set ENABLE_LIBKDEINIT_RUNPATH to ON if build type is Debian
(patch make_libkdeinit4_private.diff altered).
* Require pkg-kde-tools 0.12 due to ENABLE_LIBKDEINIT_RUNPATH change above.
+ * Pass required kdelibs cmake flags to dh_auto_configure.
+ qt-kde-team/2/debian-qt-kde.mk no longer passes them implicitly.
[ George Kiagiadakis ]
* Change my email address in uploaders.
diff --git a/debian/rules b/debian/rules
index fbbf436..b5d3ce4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,18 @@ ifeq (ia64,$(shell dpkg-architecture -qDEB_HOST_ARCH))
export CXXFLAGS += -ffunction-sections
endif
+override_dh_auto_configure:
+ $(overriden_command) -- -DKDE4_BUILD_TESTS=false \
+ -DKDE_DISTRIBUTION_TEXT="Debian packages" \
+ -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
+
.PHONY: override_dh_auto_test
override_dh_auto_install:
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list