[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 328ff6b5d21b190157b7f3693e758c26a5f16cc0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Nov 8 18:46:26 2013 +0400

    Revert "Backport 50_kfreebsd_Q_OS.diff from Qt4's packaging."
    
    A similar change has been applied upstream during 5.2 development,
    so it is useless with this version.
    
    This reverts commit e3d14528a0f3318c8a90bfd004c8ae817b31eb56.
---
 debian/changelog                     |  2 --
 debian/patches/50_kfreebsd_Q_OS.diff | 17 -----------------
 debian/patches/series                |  1 -
 3 files changed, 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de3fd84..64f16c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ qtbase-opensource-src (5.2.0~beta1+dfsg-2) UNRELEASED; urgency=low
   * Install KMS/EGL CMake's configuration files for armhf.
     - Create debian/qtbase5-dev.install-armhf.
     - Move debian/qtbase5-dev.install to debian/qtbase5-dev.install-common.
-  * Backport 50_kfreebsd_Q_OS.diff from Qt4's packaging in order to solve a
-    FTBFS in KFreeBSD.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 Nov 2013 13:48:48 -0300
 
diff --git a/debian/patches/50_kfreebsd_Q_OS.diff b/debian/patches/50_kfreebsd_Q_OS.diff
deleted file mode 100644
index 85d0738..0000000
--- a/debian/patches/50_kfreebsd_Q_OS.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Pino Toscano <pino at kde.org>
-Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL.
- Modified by Lisandro D. N. Pérez Meyer <lisandro at debian.org> for Qt5.
-Last-Update: 2013-11-07
-Forwarded: not-needed
-
---- a/src/corelib/global/qsystemdetection.h
-+++ b/src/corelib/global/qsystemdetection.h
-@@ -121,6 +121,8 @@
- #elif defined(__FreeBSD__) || defined(__DragonFly__)
- #  define Q_OS_FREEBSD
- #  define Q_OS_BSD4
-+#elif defined(__FreeBSD_kernel__)
-+#  define Q_OS_FREEBSD_KERNEL
- #elif defined(__NetBSD__)
- #  define Q_OS_NETBSD
- #  define Q_OS_BSD4
diff --git a/debian/patches/series b/debian/patches/series
index 5937cf8..35129ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ linux_no_perf.diff
 hurd_opengl_incldir.diff
 
 # Debian specific.
-50_kfreebsd_Q_OS.diff

-- 
qtbase packaging