[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-3-16-g1168e3b

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 1092b5d092806854248a44930830ceedfb06053c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 2 10:26:11 2015 +0300

    Mark bsd_volumeinfo.diff and hurd_forkfd.diff as applied upstream.
---
 debian/changelog                   | 1 +
 debian/patches/bsd_volumeinfo.diff | 5 ++---
 debian/patches/hurd_forkfd.diff    | 5 ++---
 debian/patches/series              | 2 --
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efa6ac6..35ca258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.5.1+dfsg-6) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Drop hurd-forkfd.diff, we do not need to have two patches for the same
     thing (the second one is hurd_forkfd.diff).
+  * Mark bsd_volumeinfo.diff and hurd_forkfd.diff as applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Nov 2015 21:08:40 +0300
 
diff --git a/debian/patches/bsd_volumeinfo.diff b/debian/patches/bsd_volumeinfo.diff
index a603e7f..3aebed3 100644
--- a/debian/patches/bsd_volumeinfo.diff
+++ b/debian/patches/bsd_volumeinfo.diff
@@ -2,9 +2,8 @@ Description: fix QStorageInfo on BSD4 systems
  - On NetBSD, the defines were not properly defined;
  - On all other BSD systems, we use statfs which does not have
    f_frsize memeber, revert to using f_bsize there.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-yet
-Last-Update: 2015-10-23
+Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit/?id=08be8691f7ba5e52
+Last-Update: 2015-11-02
 
 --- a/src/corelib/io/qstorageinfo_unix.cpp
 +++ b/src/corelib/io/qstorageinfo_unix.cpp
diff --git a/debian/patches/hurd_forkfd.diff b/debian/patches/hurd_forkfd.diff
index b6b2190..7096ed9 100644
--- a/debian/patches/hurd_forkfd.diff
+++ b/debian/patches/hurd_forkfd.diff
@@ -1,7 +1,6 @@
 Description: undef HAVE_WAITID if needed constants are not defined
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-yet
-Last-Update: 2015-10-23
+Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7c4f15d6702941b
+Last-Update: 2015-11-02
 
 --- a/src/3rdparty/forkfd/forkfd.c
 +++ b/src/3rdparty/forkfd/forkfd.c
diff --git a/debian/patches/series b/debian/patches/series
index 2e7cbe0..12e79e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,6 @@
 Fix-compile-error-on-big-endian.patch
 set_positionautomatic.diff
 set_WA_OutsideWSRange_for_native_widgets.patch
-
-# To be forwarded upstream
 bsd_volumeinfo.diff
 hurd_forkfd.diff
 

-- 
qtbase packaging