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

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 68e4ea1fe5940788824915fc94fe78a40de7cf42
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Feb 4 13:00:28 2016 +0000

    series: move a patch to correct subheading
---
 debian/changelog      | 2 ++
 debian/patches/series | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 29a2dd9..def4467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtbase-opensource-src (5.5.1+dfsg-12ubuntu1) UNRELEASED; 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
 
diff --git a/debian/patches/series b/debian/patches/series
index a134126..71973d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@ Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
 Fix-falsely-reported-style-for-fallback-font.patch
 Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
 xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
+Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
 
 # Will be no longer needed with Qt 5.7
 mips_no_atomic.diff
@@ -33,5 +34,4 @@ link_fbclient.diff
 qt5-qmake-arm-linux-gnueabihf
 Add-workaround-for-GL-on-Android-emulator.patch
 enable-tests.patch
-Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
 skip-largefile-test-s390x.patch

-- 
qtbase packaging