[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.2+dfsg-5-296-g69f7c3a

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu+1 branch:
commit 69f7c3a355b0cf687626217eb6fe3ac522cbb15d
Merge: 389bae5bcde40ad9e9e1de7a7b0d071b515e177c da19ecbb1b9a4019af7ce00e94ebb53a926c2d64
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Dec 3 21:50:14 2017 +0300

    Merge branch 'master' into ubuntu+1.

 debian/changelog                     | 22 +++++++++----
 debian/control                       |  2 +-
 debian/files                         |  1 -
 debian/patches/qdnslookup_crash.diff | 62 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/{qt.conf.in => qmake.conf.in} |  0
 debian/rules                         | 10 +++---
 7 files changed, 85 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index ede1907,e906a9b..1517c90
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,14 @@@
 +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-5) unstable; urgency=medium
+ 
    [ Dmitry Shachnev ]
    * Ship /usr/lib/${DEB_HOST_MULTIARCH}/qt.conf in qt5-qmake, which can be
      passed to qmake as -qtconf option for cross-building.
@@@ -12,64 -17,8 +26,58 @@@
      In this way packages depending on Desktop OpenGL can use this package as
      a dependency without the need to keep an arch list (Closes: #881943).
  
-   [ Simon Quigley ]
-   * 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
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 03 Dec 2017 10:24:03 -0300
  
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu6) bionic; urgency=medium
 +
 +  * No-change rebuild for icu soname change.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Tue, 07 Nov 2017 09:01:19 +0000
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu5) bionic; urgency=medium
 +
 +  * Revert tools location to non-multiarch.
 +
 + -- Dmitry Shachnev <mitya57 at ubuntu.com>  Thu, 02 Nov 2017 14:12:29 +0300
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu4) bionic; urgency=medium
 +
 +  * Really install the tools in the multiarch location too.
 +    (there is the same configuration option to find and install
 +     tools, so we also need this hack)
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 01 Nov 2017 11:44:27 +0100
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu3) bionic; urgency=medium
 +
 +  * Use /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin to find the old tools,
 +    because we didn't have a fully built 5.9.2 yet in Ubuntu, so lets
 +    force the old location (this change will be reverted once the current one
 +    publishes)
 +
 + -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 01 Nov 2017 10:19:07 +0100
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu2) bionic; urgency=medium
 +
 +  * Temporarily lower the build dep on qttools so that we aren't depwait on
 +    arch:all.
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Tue, 31 Oct 2017 17:25:22 -0500
 +
 +qtbase-opensource-src (5.9.2+dfsg-4ubuntu1) bionic; urgency=medium
 +
 +  [ Simon Quigley ]
 +  * Merge from Debian Sid. Remaining changes:
 +    - Depend on libssl1.0.0 instead of libssl1.0.2.
 +    - Add arm64 to the architectures that GLES is enabled on.
 +    - Make qt5-default Multi-Arch: same.
 +
 +  [ Dmitry Shachnev ]
 +  * The tests are not run currently anyway, so drop the tests-related
 +    delta with Debian.
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Tue, 31 Oct 2017 08:45:58 -0500
 +
  qtbase-opensource-src (5.9.2+dfsg-4) unstable; urgency=medium
  
    * Upload to unstable.
diff --cc debian/patches/series
index ed90b49,a2da090..9510925
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,7 +1,5 @@@
  # Backported from upstream.
 -qglxconvenience_nullptr.diff
 -postgresql_10.diff
+ qdnslookup_crash.diff
  
  # Debian specific.
  gnukfreebsd.diff

-- 
qtbase packaging