[SCM] qtbase packaging branch, experimental, updated. debian/5.2.1+dfsg-2-3-gd428baf

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit d428baf2816e52a05432f9a985ac674d7bb52213
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Mar 15 10:02:36 2014 -0300

    Remove linux_no_perf.diff.
    
    It was for IA64 and we no longer have it around.
---
 debian/changelog                  |  2 ++
 debian/patches/linux_no_perf.diff | 17 -----------------
 debian/patches/series             |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5308f3a..ab14f2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtbase-opensource-src (5.2.1+dfsg-3) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add license to mark_private_symbols.sh and corresponding entry in
     debian/copyright.
+  * Remove linux_no_perf.diff used to disable perf events on Linux/IA64. We no
+    longer have IA64 around.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Mar 2014 15:21:04 -0300
 
diff --git a/debian/patches/linux_no_perf.diff b/debian/patches/linux_no_perf.diff
deleted file mode 100644
index bd25707..0000000
--- a/debian/patches/linux_no_perf.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: Disable perf events on Linux/ia64.
- It seems ia64 does not have perf events compiled, so disable them.
-Last-Update: 2013-08-11
-Forwarded: no
-
---- a/src/testlib/qbenchmark_p.h
-+++ b/src/testlib/qbenchmark_p.h
-@@ -63,7 +63,7 @@
- #undef QTESTLIB_USE_VALGRIND
- #endif
- 
--#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_ANDROID)
-+#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_ANDROID) && !defined(Q_PROCESSOR_IA64)
- #define QTESTLIB_USE_PERF_EVENTS
- #else
- #undef QTESTLIB_USE_PERF_EVENTS
diff --git a/debian/patches/series b/debian/patches/series
index 871a5cb..677d040 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-linux_no_perf.diff
 hurd_opengl_incldir.diff
 fix_power_atomic_code.patch
 support_mips_atomic_on_pre-mips32_archs.patch

-- 
qtbase packaging