[SCM] qtchooser packaging branch, master, updated. debian/64-ga1b6736-3-3-g8f2294a

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtchooser.git;a=commitdiff;h=a52ccc5

The following commit has been merged in the master branch:
commit a52ccc56edfd9e0ce81e715df1b390d861d73894
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 30 13:59:02 2017 +0300

    Update Qt 5 configuration file for the new binaries path.
    
    Closes: #880159.
---
 debian/changelog | 2 ++
 debian/rules     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2ba6cad..8bb5362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtchooser (64-ga1b6736-4) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update Qt 5 configuration file for the new binaries path (closes: #880159).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 30 Oct 2017 13:54:46 +0300
 
diff --git a/debian/rules b/debian/rules
index 8f2f275..290df28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,9 @@ override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/qtchooser/usr/share/qtchooser
 	mkdir -p $(CURDIR)/debian/qtchooser/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
 
+	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" > $(CURDIR)/debian/qtchooser/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf
+	echo "/usr/lib/qt5/bin" > $(CURDIR)/debian/qtchooser/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf
 	for ver in 4 5; do \
-		echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt$${ver}/bin" > $(CURDIR)/debian/qtchooser/usr/share/qtchooser/qt$${ver}-$(DEB_HOST_MULTIARCH).conf; \
 		echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/qtchooser/usr/share/qtchooser/qt$${ver}-$(DEB_HOST_MULTIARCH).conf; \
 		ln -s /usr/share/qtchooser/qt$${ver}-$(DEB_HOST_MULTIARCH).conf \
 			$(CURDIR)/debian/qtchooser/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/$${ver}.conf; \

-- 
qtchooser packaging