[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-10ubuntu2-12-g29779c5

Timo Jyrinki timo at moszumanska.debian.org
Mon Jan 18 08:29:23 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 29779c5459f01a35012a651c0895ab22f9c2a34b
Merge: 60608bdff210462bcc56c01787acdc15f4cf8fbf 2717974982a9a0ba12880049c45c429430bbec9b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 18 08:29:12 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                                   |  17 +++
 ...x-crash-on-exit-caused-by-QStringLiterals.patch |  15 +--
 debian/patches/multiscreen.diff                    |  97 ++++++++++++++
 debian/patches/series                              |   3 +
 ..._dont_select_XInput_events_on_root_window.patch |  40 ++++++
 ...b_fix_drag_and_drop_when_window_is_hidden.patch | 139 +++++++++++++++++++++
 6 files changed, 299 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index ab7c568,b520bec..e1ebf43
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,20 +1,37 @@@
+ qtbase-opensource-src (5.5.1+dfsg-12) unstable; urgency=medium
+ 
+   * Backport xcb_dont_select_XInput_events_on_root_window.patch
+     (Closes: #807528).
+   * Refresh patches.
+   * Backport xcb_fix_drag_and_drop_when_window_is_hidden.patch.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 06 Jan 2016 11:33:21 -0300
+ 
+ qtbase-opensource-src (5.5.1+dfsg-11) unstable; urgency=medium
+ 
+   [ Adam Majer ]
+   * Backport an upstream patch to fix issue with multiple XCB
+     screens, each having multiple screens. (multiscreen.diff).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 05 Jan 2016 14:39:24 -0300
+ 
 +qtbase-opensource-src (5.5.1+dfsg-10ubuntu2) xenial; urgency=medium
 +
 +  * Revert libqt5gui5's relationship to libqt5xcbqpa5 from Recommends back
 +    to Depends for the time being, unbreaking autopilot tests; see e.g.
 +    https://bugs.debian.org/809176.
 +
 + -- Colin Watson <cjwatson at ubuntu.com>  Tue, 05 Jan 2016 22:26:46 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-10ubuntu1) xenial; urgency=medium
 +
 +  * Merge with Debian.
 +  * qnetworkaccessmanager_accessibility.diff replaces 
 +    Make-sure-networkAccessibilityChanged-is-emitted.patch.
 +  * debian/patches/series: reorder to apply Ubuntu's backported patches
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 04 Jan 2016 07:03:39 +0000
 +
  qtbase-opensource-src (5.5.1+dfsg-10) unstable; urgency=medium
  
    * Demote libqt5gui5's dependency on libqt5xcbqpa5 to a recommendation,
diff --cc debian/patches/series
index 06a62ba,2118627..31467ef
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -17,7 -9,9 +17,10 @@@ qnetworkreply_abort_socket.dif
  qnetworkaccessmanager_accessibility.diff
  uic_qvalidator_qtgui.diff
  Fix-crash-on-exit-caused-by-QStringLiterals.patch
 +Make-UnknownAccessibility-not-block-requests.patch
+ multiscreen.diff
+ xcb_dont_select_XInput_events_on_root_window.patch
+ xcb_fix_drag_and_drop_when_window_is_hidden.patch
  
  # Debian specific.
  gnukfreebsd.diff

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list