[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-37-gab91ed9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit efa68786500738c477b46fd10b468b771864e78d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 25 19:26:25 2015 -0300

    Delete cve-2015-0295.diff already present upstream.
---
 debian/changelog                  |  2 ++
 debian/patches/cve-2015-0295.diff | 29 -----------------------------
 debian/patches/series             |  1 -
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15867c8..b99fa18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
   * Update symbols files with buildds' logs.
   * Bump qtbase-abi to 5-4-2.
   * Refresh gnukfreebsd.diff.
+  * Delete patches backported from upstream already present in this release:
+    - qtsystemtrayicon_handle_submenus_correctly.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 May 2015 18:35:01 -0300
 
diff --git a/debian/patches/cve-2015-0295.diff b/debian/patches/cve-2015-0295.diff
deleted file mode 100644
index af853d4..0000000
--- a/debian/patches/cve-2015-0295.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: fix a division by zero when processing malformed BMP files
-Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit?id=661f6bfd032dacc6
-Bug-Upstream: https://bugreports.qt.io/browse/QTBUG-44547
-Bug-Debian: https://bugs.debian.org/779550
-Last-Update: 2015-03-02
-
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -314,12 +314,20 @@
-         }
-     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
-         red_shift = calc_shift(red_mask);
-+        if (((red_mask >> red_shift) + 1) == 0)
-+            return false;
-         red_scale = 256 / ((red_mask >> red_shift) + 1);
-         green_shift = calc_shift(green_mask);
-+        if (((green_mask >> green_shift) + 1) == 0)
-+            return false;
-         green_scale = 256 / ((green_mask >> green_shift) + 1);
-         blue_shift = calc_shift(blue_mask);
-+        if (((blue_mask >> blue_shift) + 1) == 0)
-+            return false;
-         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
-         alpha_shift = calc_shift(alpha_mask);
-+        if (((alpha_mask >> alpha_shift) + 1) == 0)
-+            return false;
-         alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
-     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
-         blue_mask = 0x000000ff;
diff --git a/debian/patches/series b/debian/patches/series
index 57f15e6..3c697f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
-cve-2015-0295.diff
 qtsystemtrayicon_handle_submenus_correctly.patch
 xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
 require_fpic_instead_of_fpie.patch

-- 
qtbase packaging