[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-7-10-g5bc5e6e

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit a4560f781e952635483a17e219fc279a322e4093
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jul 5 22:34:26 2013 -0300

    Remove undef_B0.diff, applied upstream.
---
 debian/changelog             |    1 +
 debian/patches/series        |    1 -
 debian/patches/undef_B0.diff |   24 ------------------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50b5b7d..7017358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtbase-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low
   * Fix watch file with new url.
   * Make libqt5core5 provide qtbase-abi-5-1-0.
   * Update symbols files with latest 5.0.2 build logs.
+  * Remove patches applied upstream: undef_B0.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Jun 2013 14:04:21 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 19257fb..5530e68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-undef_B0.diff
 deppath_gnu.diff
 Rename-qAbs-Function-for-timeval.patch
 
diff --git a/debian/patches/undef_B0.diff b/debian/patches/undef_B0.diff
deleted file mode 100644
index 8be1571..0000000
--- a/debian/patches/undef_B0.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Undefine B0 macro defined also in the glibc headers
- Undefined B0 in qpagedpaintdevice.h too (already done in qprinter.h).
- No comment on using two letter capital identifiers as enum values in
- a public API.
-Author: Matthias Klose <matthias.klose at canonical.com>
-Author: Shawn Rutledge <shawn.rutledge at digia.com>
-Forwarded: https://codereview.qt-project.org/#change,48368
-Last-Update: 2013-04-08
-
-Index: qtbase-opensource-src-5.0.1+dfsg/src/gui/painting/qpagedpaintdevice.h
-===================================================================
---- qtbase-opensource-src-5.0.1+dfsg.orig/src/gui/painting/qpagedpaintdevice.h	2013-01-29 12:03:00.000000000 -0700
-+++ qtbase-opensource-src-5.0.1+dfsg/src/gui/painting/qpagedpaintdevice.h	2013-02-18 13:21:01.000000000 -0700
-@@ -44,6 +44,10 @@
- 
- #include <QtGui/qpaintdevice.h>
- 
-+#if defined(B0)
-+#undef B0 // Terminal hang-up.  We assume that you do not want that.
-+#endif
-+
- QT_BEGIN_HEADER
- 
- QT_BEGIN_NAMESPACE

-- 
qtbase packaging