[SCM] qtbase packaging branch, master, updated. debian/5.7.1-20161021+dfsg-6-4-ga49b1f4

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit a49b1f47cc8f34cc2d952fb689b3c6807ed13e03
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Dec 11 12:54:57 2016 -0300

    Remove bogus hostdatadir entry.
    
    According to Qmake we are effectively using the second one,
    which makes sense ;)
---
 debian/changelog | 2 ++
 debian/rules     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d464cc2..f2a3fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtbase-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Mark QPA symbols as private with qpa_is_private.patch. This might get
     solved upstream in the future (see the thread pointed in the patch).
+  * Remove a bogus double hostdatadir entry while configuring Qt. Thanks
+    Nick Shaforostoff for the bug! (Closes: 847769).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 23 Nov 2016 15:19:37 +0300
 
diff --git a/debian/rules b/debian/rules
index 08d265a..bfb3ece 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,6 @@ override_dh_auto_configure:
 	            -headerdir "/usr/include/$(DEB_HOST_MULTIARCH)/qt5" \
 	            -datadir "/usr/share/qt5" \
 	            -archdatadir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5" \
-	            -hostdatadir "/usr/share/qt5" \
 	            -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins" \
 	            -importdir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/imports" \
 	            -translationdir "/usr/share/qt5/translations" \

-- 
qtbase packaging