[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.2+dfsg-6-297-gd3575c2

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu+1 branch:
commit d3575c24754fce5e1cd86c5c55648e7af377813d
Merge: 69f7c3a355b0cf687626217eb6fe3ac522cbb15d 96a2fe7547ac32d07384a948037b39ded7031251
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 5 14:05:39 2017 +0300

    Merge tag 'debian/5.9.2+dfsg-6' into ubuntu+1
    
    5.9.2+dfsg-6 unstable; urgency=medium

 debian/changelog                     | 11 +++++++++++
 debian/control                       |  2 +-
 debian/{qmake.conf.in => qt.conf.in} |  0
 debian/rules                         |  6 +++---
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 1517c90,6d32bdf..d447a11
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,23 @@@
 +qtbase-opensource-src (5.9.3+dfsg-0ubuntu1) bionic; urgency=medium
 +
 +  * New upstream release.
 +  * Refresh patches, and delete reverse-applicable ones:
 +    - postgresql_10.diff
 +    - qglxconvenience_nullptr.diff
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 30 Nov 2017 16:51:16 -0600
 +
+ qtbase-opensource-src (5.9.2+dfsg-6) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * 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).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 04 Dec 2017 09:31:27 -0300
+ 
  qtbase-opensource-src (5.9.2+dfsg-5) unstable; urgency=medium
  
    [ Dmitry Shachnev ]

-- 
qtbase packaging