travis: fix detection of qt5

bareos · Oct 4, 2018 · 69568be · 69568be
1 parent c19eca7
commit 69568be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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