[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-5-3-g3fd2b60

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 3fd2b60fec809377115053818a40d72d94e65805
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 4 11:20:11 2017 +0300

    Fix the name of installed qt.conf file.
    
    It should not be qmake.conf. This corresponds to qmake’s -qtconf option
    and replaces the qt.conf file on default search path.
    
    See qmake-qt5(1) and http://doc.qt.io/qt-5/qt-conf.html for details.
    
    This reverts commit d005a57c05b4a9eefeeeb93c609d72562970d875.
---
 debian/changelog                     | 3 +++
 debian/{qmake.conf.in => qt.conf.in} | 0
 debian/qt5-qmake.install             | 2 +-
 debian/rules                         | 6 +++---
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b587f2..1412878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.9.2+dfsg-6) UNRELEASED; urgency=medium
   * Make libqt5opengl5-dev provide libqt5opengl5-desktop-dev and not
     libqt5opengl5. Thanks Adrian Bunk for noticing.
 
+  [ Dmitry Shachnev ]
+  * Fix the name of installed qt.conf file (it should not be qmake.conf).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Dec 2017 21:59:03 -0300
 
 qtbase-opensource-src (5.9.2+dfsg-5) unstable; urgency=medium
diff --git a/debian/qmake.conf.in b/debian/qt.conf.in
similarity index 100%
rename from debian/qmake.conf.in
rename to debian/qt.conf.in
diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install
index c00a21e..9752f1c 100644
--- a/debian/qt5-qmake.install
+++ b/debian/qt5-qmake.install
@@ -1,3 +1,3 @@
 usr/bin/*-qmake
 usr/lib/*/qt5/mkspecs/
-usr/lib/*/qt5/qmake.conf
+usr/lib/*/qt5/qt.conf
diff --git a/debian/rules b/debian/rules
index 06f9814..36890ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,13 +257,13 @@ endif
 
 	# Helper files for cross-building
 	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5
-	sed s/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/ debian/qmake.conf.in \
-		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qmake.conf
+	sed s/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/ debian/qt.conf.in \
+		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
 
 	mkdir -p debian/tmp/usr/bin
 	echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 	echo "exec /usr/lib/qt5/bin/qmake" \
-		"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qmake.conf" \
+		"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \
 		'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
 		'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
 		'QMAKE_LINK=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \

-- 
qtbase packaging