[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-13ubuntu2-6-g111087c

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 111087c77b3438c192eef6a5d25c21990290c2cd
Merge: ad956b66add5aaac173146be0612ebc7b4248215 1e39f17fde84fb72388bb1b2a4f2d07b5adb91b1
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Feb 17 09:50:22 2016 +0000

    Merge with Debian.

 debian/changelog                                   | 15 ++++
 debian/patches/fix_not_delivering_focus.patch      | 86 ++++++++++++++++++++++
 .../patches/fix_potential_division_by_zero.patch   | 29 ++++++++
 debian/patches/series                              |  2 +
 4 files changed, 132 insertions(+)

diff --cc debian/changelog
index 786e9ae,d82c1cd..750c729
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,12 +1,45 @@@
++qtbase-opensource-src (5.5.1+dfsg-14ubuntu1) xenial; urgency=medium
++
++  * Merge with Debian.
++
++ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 17 Feb 2016 09:50:07 +0000
++
+ qtbase-opensource-src (5.5.1+dfsg-14) unstable; urgency=medium
+ 
+   * Backport fix_not_delivering_focus.patch to fix not delivering focusIn event
+     on hide/show.
+   * Backport fix_potential_division_by_zero.patch to fix potential division by
+     zero (Closes: #814699).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 15 Feb 2016 14:51:51 -0300
+ 
 +qtbase-opensource-src (5.5.1+dfsg-13ubuntu3) xenial; urgency=medium
 +
 +  * Add back disable_overlay_scrollbars.diff, needed until Qt 5.7 for GTK2.
 +    (LP: #1531516)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 16 Feb 2016 06:27:42 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-13ubuntu2) xenial; urgency=medium
 +
 +  * Forward-port networking fixes from 5.4 series:
 +    - net-bearer-nm-disconnect-ap-signals7.patch (LP: #1480877)
 +    - qnam-ubuntu-fix6.patch (LP: #1528886)
 +    - xenial would potentially now have fixes for (LP: #1506015)
 +      (LP: #1507769) (LP: #1533508)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 09 Feb 2016 08:19:43 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-13ubuntu1) xenial; urgency=medium
 +
 +  * Merge with Debian.
 +  * debian/patches/series: move a patch to under correct subheading
 +  * Backport XCB patch related to screen disconnection handling QTBUG-42985:
 +    - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
 +  * Remove transitional package qt5-qmake-cross-armhf.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 05 Feb 2016 07:18:59 +0000
 +
  qtbase-opensource-src (5.5.1+dfsg-13) unstable; urgency=medium
  
    * Fix URLs pointing to our "How to package Qt based stuff" page

-- 
qtbase packaging