[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-4-9-g5efc3f2

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 5efc3f2b941c85c063037e69ab3f1369732f1509
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Nov 30 21:40:17 2017 +0300

    Change PCRE build-dependency to PCRE2.
    
    Qt switched to PCRE2 in 5.9 (see upstream commit 9ca635482d649c59).
    
    Pass -system-pcre to configure to make sure that the system version will
    be used.
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 debian/rules     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e25214c..81bcfce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtbase-opensource-src (5.9.2+dfsg-5) UNRELEASED; urgency=medium
   * Ship /usr/bin/${DEB_HOST_GNU_TYPE}-qmake wrapper script in qt5-qmake, for
     using qmake with autoconf and AC_CHECK_TOOL.
   * Backport upstream patches for PostgreSQL 10 support (closes: #879960).
+  * Change PCRE build-dependency to PCRE2. Qt switched to PCRE2 in 5.9.
+    Pass a configure option to make sure that the system version is used.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Make libqt5opengl5-dev provide libqt5opengl5-desktop-dev on !armel and !armhf.
diff --git a/debian/control b/debian/control
index 22bacd1..b4e50ec 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 10.3),
                libinput-dev [linux-any],
                libjpeg-dev,
                libmtdev-dev [linux-any],
-               libpcre3-dev,
+               libpcre2-dev,
                libpng-dev,
                libpq-dev,
                libproxy-dev,
diff --git a/debian/rules b/debian/rules
index 0e6ee40..f49989c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,7 @@ override_dh_auto_configure:
 	            -system-libpng \
 	            -system-libjpeg \
 	            -system-doubleconversion \
+	            -system-pcre \
 	            -openssl \
 	            -no-rpath \
 	            -verbose \

-- 
qtbase packaging