[SCM] qtbase packaging branch, experimental, updated. debian/5.8.0+dfsg-2-4-g1dc7521

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit cb6554f54dee8415868daaa85eb017add7f91ff5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Feb 16 10:58:41 2017 +0300

    Mark hurd_tilde.diff as applied upstream.
---
 debian/changelog               | 1 +
 debian/patches/hurd_tilde.diff | 3 +--
 debian/patches/series          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26d60e8..c67ae63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.8.0+dfsg-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Mark the private parts of QtEglFSDeviceIntegration as non-Hurd too.
+  * Mark hurd_tilde.diff as applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 16 Feb 2017 10:51:02 +0300
 
diff --git a/debian/patches/hurd_tilde.diff b/debian/patches/hurd_tilde.diff
index 062098e..bc222e0 100644
--- a/debian/patches/hurd_tilde.diff
+++ b/debian/patches/hurd_tilde.diff
@@ -1,6 +1,5 @@
 Description: undef TILDE to fix compilation on Hurd
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: https://codereview.qt-project.org/185255
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=a373a01ed73b29b2
 Last-Update: 2017-02-10
 
 --- a/src/gui/text/qcssparser_p.h
diff --git a/debian/patches/series b/debian/patches/series
index bb59fda..dda5b65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
 # Backported from upstream
 qsettings_simplify_logic.diff
 qsettings_XDG_CONFIG_DIRS.diff
+hurd_tilde.diff
 
 # Forwarded upstream
 qvncscreen_semicolon.diff
-hurd_tilde.diff
 
 # Debian specific.
 no_dbus_dependency.diff

-- 
qtbase packaging