From 69568be5d7e7ef447600f9dd1b9d4edf8dfcbcb3 Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Thu, 4 Oct 2018 17:16:27 +0200 Subject: [PATCH] travis: fix detection of qt5 --- .travis/travis_before_install.sh | 2 ++ core/debian/control | 2 +- core/debian/control.in | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis/travis_before_install.sh b/.travis/travis_before_install.sh index c00aff5f916..94b2785dbc0 100755 --- a/.travis/travis_before_install.sh +++ b/.travis/travis_before_install.sh @@ -1,6 +1,8 @@ #!/bin/bash sudo apt-get -qq update +# qt5 should be used. Remove qt4-dev to avoid confusion. +sudo apt-get remove libqt4-dev cd core dpkg-checkbuilddeps 2> /tmp/dpkg-builddeps || true cat /tmp/dpkg-builddeps diff --git a/core/debian/control b/core/debian/control index 1b97b2c1b69..7b9cbe629b5 100644 --- a/core/debian/control +++ b/core/debian/control @@ -51,7 +51,7 @@ Build-Depends: acl-dev, # Debian >= 8, Ubuntu >= 15.04 # univention: # ucslint, univention-config-dev -Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools +Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools, libqt4-dev Standards-Version: 3.9.6 Vcs-Git: git://github.com/bareos/bareos.git -b master Vcs-Browser: https://github.com/bareos/bareos/tree/master diff --git a/core/debian/control.in b/core/debian/control.in index 5a6e4a808d6..bb294b9ae3b 100644 --- a/core/debian/control.in +++ b/core/debian/control.in @@ -51,7 +51,7 @@ Build-Depends: acl-dev, # Debian >= 8, Ubuntu >= 15.04 # univention: # ucslint, univention-config-dev -Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools +Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools, libqt4-dev Standards-Version: 3.9.6 Vcs-Git: git://github.com/bareos/bareos.git -b master Vcs-Browser: https://github.com/bareos/bareos/tree/master