From 4fbca59fd9bbced3ef8b3e60ecdca3b5aff86298 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 14 Sep 2014 19:11:46 +0200 Subject: [PATCH] Revert "Build cmake-qt-gui against Qt 5." This reverts commit d3b54e43659c993ebf45b21f0dc5173e37942356. Conflicts: debian/control --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 63724f5ad..8d90baff2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ cmake (3.0.2-1) UNRELEASED; urgency=medium - Adds support for OpenRISC (or1k). (Closes: #749004) * Detect the processor when running on Hurd. (Closes: #761060) - Add hurd_host_system_processor.diff, cherry-picked from upstream. + * Revert cmake-qt-gui to Qt 4 for now as qtbase 5 fails to build on some + architectures. -- Felix Geyer Sat, 13 Sep 2014 15:31:25 +0200 diff --git a/debian/control b/debian/control index 23af4bcd4..a239e5204 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: bash-completion, libncurses5-dev, procps [!hurd-any], python-sphinx, - qtbase5-dev, + libqt4-dev (>= 4.4.0), zlib1g-dev Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/collab-maint/cmake.git