reverting qt5 setup according to owncloud/client#5470 (comment)

owncloud · Feb 3, 2017 · 67aac50 · SamuAlfageme · Feb 3, 2017 · jnweiger
1 parent 4da9461
commit 67aac50
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/jenkins/obs_integration/templates/client/v2_2_4/SHORTNAME-client.dsc.in b/jenkins/obs_integration/templates/client/v2_2_4/SHORTNAME-client.dsc.in
@@ -7,11 +7,12 @@ Binary: [% shortname %]-client
 Maintainer: [% maintainer_person %]
 Architecture: any
 Standards-Version: 3.9.6
-# we need qt5 >= 5.5.1 https://github.com/owncloud/client/issues/5432
+# We need qt5 >= 5.5.1 https://github.com/owncloud/client/issues/5432
+# Reverted according to https://github.com/owncloud/client/issues/5470#issuecomment-275680311
 Build-Depends: debhelper (>= 9), cmake, sed, doxygen, unzip | bash,
 	libsqlite3-dev, python-sphinx | python3-sphinx, libssl-dev,
-	libqt5webkit5-dev (>= 2.2.0) | libqtwebkit-dev (>= 2.2.0),
-	qt5keychain-dev (>= 0.7.0) | qtkeychain-dev (>= 0.7.0)
+	libqtwebkit-dev (>= 2.2.0) | libqt5webkit5-dev (>= 2.2.0),
+	qtkeychain-dev (>= 0.7.0) | qt5keychain-dev (>= 0.7.0
 Package-List:
  lib[% shortname %]sync0 deb libs optional
  [% shortname %]-client deb net optional

diff --git a/jenkins/obs_integration/templates/client/v2_3_0/SHORTNAME-client.dsc.in b/jenkins/obs_integration/templates/client/v2_3_0/SHORTNAME-client.dsc.in
@@ -8,10 +8,11 @@ Maintainer: [% maintainer_person %]
 Architecture: any
 Standards-Version: 3.9.6
 # we need qt5 >= 5.5.1 https://github.com/owncloud/client/issues/5432
+# Reverted according to https://github.com/owncloud/client/issues/5470#issuecomment-275680311
 Build-Depends: debhelper (>= 9), cmake, sed, doxygen, unzip | bash,
 	libsqlite3-dev, python-sphinx | python3-sphinx, libssl-dev,
-	libqt5webkit5-dev (>= 2.2.0) | libqtwebkit-dev (>= 2.2.0),
-	qt5keychain-dev (>= 0.7.0) | qtkeychain-dev (>= 0.7.0)
+	libqtwebkit-dev (>= 2.2.0) | libqt5webkit5-dev (>= 2.2.0),
+	qtkeychain-dev (>= 0.7.0) | qt5keychain-dev (>= 0.7.0
 Package-List:
  lib[% shortname %]sync0 deb libs optional
  [% shortname %]-client deb net optional

diff --git a/jenkins/obs_integration/templates/client/v2_4_0/SHORTNAME-client.dsc.in b/jenkins/obs_integration/templates/client/v2_4_0/SHORTNAME-client.dsc.in
@@ -8,10 +8,11 @@ Maintainer: [% maintainer_person %]
 Architecture: any
 Standards-Version: 3.9.6
 # we need qt5 >= 5.5.1 https://github.com/owncloud/client/issues/5432
+# Reverted according to https://github.com/owncloud/client/issues/5470#issuecomment-275680311
 Build-Depends: debhelper (>= 9), cmake, sed, doxygen, unzip | bash,
 	libsqlite3-dev, python-sphinx | python3-sphinx, libssl-dev,
-	libqt5webkit5-dev (>= 2.2.0) | libqtwebkit-dev (>= 2.2.0),
-	qt5keychain-dev (>= 0.7.0) | qtkeychain-dev (>= 0.7.0)
+	libqtwebkit-dev (>= 2.2.0) | libqt5webkit5-dev (>= 2.2.0),
+	qtkeychain-dev (>= 0.7.0) | qt5keychain-dev (>= 0.7.0
 Package-List:
  lib[% shortname %]sync0 deb libs optional
  [% shortname %]-client deb net optional