[Pkg-owncloud-commits] [qtkeychain] 63/63: Switch to Qt5 as default build.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository qtkeychain.

commit 0eeab736f8299421baf7c677f1fe5fb08a264325
Author: Sandro Knauß <hefee at debian.org>
Date:   Sat Jun 10 16:37:31 2017 +0200

    Switch to Qt5 as default build.
---
 debian/changelog |  1 +
 debian/rules     | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a8bcf8..373f5f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtkeychain (0.8.0-1) UNRELEASED; urgency=medium
   * Add new build dependencies (pkg-config and libsecret-1).
   * Add patch: fix-qt4-build.patch:
     - Make Qt4 builds successfull again.
+  * Switch to Qt5 as default build.
 
  -- Sandro Knauß <hefee at debian.org>  Sat, 10 Jun 2017 15:12:54 +0200
 
diff --git a/debian/rules b/debian/rules
index 6060f1d..4fe492b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,19 +13,19 @@ include /usr/share/dpkg/buildflags.mk
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf build-qt5
+	rm -rf build-Qt4
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_WITH_QT4=On
-	dh_auto_configure --builddirectory=build-qt5 --
+	dh_auto_configure --
+	dh_auto_configure --builddirectory=build-Qt4  -- -DBUILD_WITH_QT4=ON
 
 override_dh_auto_build:
 	dh_auto_build
-	dh_auto_build --builddirectory=build-qt5
+	dh_auto_build --builddirectory=build-Qt4
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_auto_install --builddirectory=build-qt5
+	dh_auto_install --builddirectory=build-Qt4
 
 override_dh_install:
 	dh_install --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git