[SCM] qtbase packaging branch, experimental, updated. debian/5.9.2+dfsg-6-14-g789a7ee

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 789a7ee34645e9750831aa4a685821b2ba814452
Merge: 6680b31c90084a8be7cc28a3aca1eed4fa5cc6b5 96a2fe7547ac32d07384a948037b39ded7031251
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 5 14:08:33 2017 +0300

    Merge branch 'master' into experimental.

 debian/changelog                     | 14 ++++++++++++--
 debian/control                       |  2 +-
 debian/{qmake.conf.in => qt.conf.in} |  0
 debian/qt5-qmake.install             |  2 +-
 debian/rules                         |  6 +++---
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 4075360,6d32bdf..a07f107
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,14 +1,37 @@@
 +qtbase-opensource-src (5.10.0~rc2+dfsg-1) UNRELEASED; urgency=medium
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
-   * Merge branch master into experimental. This brings in the changes in
-     5.9.2+dfsg-5.
++  * Merge 5.9.2+dfsg-6 upload from unstable.
 +
 +  [ Dmitry Shachnev ]
 +  * New upstream release candidate.
 +  * Update symbols files from buildds’ logs.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Dec 2017 10:37:03 -0300
 +
 +qtbase-opensource-src (5.10.0~rc1+dfsg-1) experimental; urgency=medium
 +
 +  * New upstream release candidate.
 +  * Update debian/watch to track 5.10 development releases.
 +  * Drop qglxconvenience_nullptr.diff, included upstream.
 +  * Build with OpenSSL 1.1 (closes: #859671).
 +  * Update install files for the new version.
 +  * Update symbols files from the current build logs.
 +  * Update debian/copyright using debian/scripts/update-copyright.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 28 Nov 2017 16:43:35 +0300
 +
+ 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