Revert "Build cmake-qt-gui against Qt 5."
This reverts commit d3b54e43659c993ebf45b21f0dc5173e37942356. Conflicts: debian/control
This commit is contained in:
parent
114994b110
commit
4fbca59fd9
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -4,6 +4,8 @@ cmake (3.0.2-1) UNRELEASED; urgency=medium
|
|||||||
- Adds support for OpenRISC (or1k). (Closes: #749004)
|
- Adds support for OpenRISC (or1k). (Closes: #749004)
|
||||||
* Detect the processor when running on Hurd. (Closes: #761060)
|
* Detect the processor when running on Hurd. (Closes: #761060)
|
||||||
- Add hurd_host_system_processor.diff, cherry-picked from upstream.
|
- 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 <fgeyer@debian.org> Sat, 13 Sep 2014 15:31:25 +0200
|
-- Felix Geyer <fgeyer@debian.org> Sat, 13 Sep 2014 15:31:25 +0200
|
||||||
|
|
||||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -15,7 +15,7 @@ Build-Depends: bash-completion,
|
|||||||
libncurses5-dev,
|
libncurses5-dev,
|
||||||
procps [!hurd-any],
|
procps [!hurd-any],
|
||||||
python-sphinx,
|
python-sphinx,
|
||||||
qtbase5-dev,
|
libqt4-dev (>= 4.4.0),
|
||||||
zlib1g-dev
|
zlib1g-dev
|
||||||
Standards-Version: 3.9.5
|
Standards-Version: 3.9.5
|
||||||
Vcs-Git: git://anonscm.debian.org/collab-maint/cmake.git
|
Vcs-Git: git://anonscm.debian.org/collab-maint/cmake.git
|
||||||
|
Loading…
x
Reference in New Issue
Block a user