[SCM] extra-cmake-modules packaging branch, kubuntu_unstable, updated. ubuntu/5.18.0-0ubuntu1-5-g46b6035
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Fri Apr 29 02:29:03 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=46b6035
The following commit has been merged in the kubuntu_unstable branch:
commit 46b60351e099b6b9d2459c8969f479ec7041cf68
Author: Scarlett Clark <sgclark at kde.org>
Date: Thu Apr 28 19:11:46 2016 -0700
Fix the CONFIGURE_FLAGS to instead use the proper DEB_CMAKE_CUSTOM_FLAGS configure override.
---
debian/changelog | 2 ++
debian/rules | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index d88b901..86fcca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ extra-cmake-modules (5.21.0-0ubuntu1) UNRELEASED; urgency=medium
* Seems BUILD_QTHELP_DOCS is OFF by default, Turning ON
in rules, with CONFIGURE_FLAGS. This will hopefully silence
the missing deps check in CI.
+ * Fix the CONFIGURE_FLAGS to instead use the proper
+ DEB_CMAKE_CUSTOM_FLAGS configure override.
-- Scarlett Clark <sgclark at kubuntu.org> Mon, 25 Apr 2016 11:57:30 -0700
diff --git a/debian/rules b/debian/rules
index 2b1a1e2..4bf15f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,10 @@
# -*- makefile -*-
include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-CONFIGURE_FLAGS += BUILD_QTHELP_DOCS=ON
+DEB_CMAKE_CUSTOM_FLAGS += BUILD_QTHELP_DOCS=ON
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(DEB_CMAKE_CUSTOM_FLAGS)
override_dh_install:
$(overridden_command)
--
extra-cmake-modules packaging
More information about the pkg-kde-commits
mailing list