[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0+dfsg-7-4-g5e8a8ec

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 5e8a8ec9173fd8834d9d19dc9317493baace70bd
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Feb 7 13:13:31 2014 -0300

    Delete uname_include.diff, applied upstream.
---
 debian/changelog                  |  2 +-
 debian/patches/series             |  1 -
 debian/patches/uname_include.diff | 18 ------------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5740c15..8076e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ qtbase-opensource-src (5.2.1+dfsg-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
-  * Remove sha3_64bit_BE.diff, applied upstream.
+  * Remove sha3_64bit_BE.diff and uname_include.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Feb 2014 13:06:24 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 5ba6c5f..a92ecaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ linux_no_perf.diff
 hurd_opengl_incldir.diff
 fix_power_atomic_code.patch
 support_mips_atomic_on_pre-mips32_archs.patch
-uname_include.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
 enable_s390_detection.patch
diff --git a/debian/patches/uname_include.diff b/debian/patches/uname_include.diff
deleted file mode 100644
index 5222b01..0000000
--- a/debian/patches/uname_include.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: include sys/utsname.h on Unix
- It is needed for using uname(3).
-Last-Update: 2013-12-14
-Forwarded: no
-
---- a/src/corelib/io/qfileselector.cpp
-+++ b/src/corelib/io/qfileselector.cpp
-@@ -50,6 +50,9 @@
- #include <QtCore/QFileInfo>
- #include <QtCore/QLocale>
- #include <QtCore/QDebug>
-+#if defined(Q_OS_UNIX)
-+# include <sys/utsname.h>
-+#endif
- 
- QT_BEGIN_NAMESPACE
- 

-- 
qtbase packaging