[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.4.1+dfsg-4ubuntu2-3-g961c6d1

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 864eab5b80bbdae2b9672b166cbd469fa022ef2c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jun 1 09:52:34 2015 +0000

    debian/patches/series: enable_pie.patch is actually an upstreamed patch
---
 debian/changelog      | 2 +-
 debian/patches/series | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14c45b2..8c84c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 qtbase-opensource-src (5.4.1+dfsg-4ubuntu3) UNRELEASED; urgency=medium
 
-  * 
+  * debian/patches/series: enable_pie.patch is actually an upstreamed patch
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 28 May 2015 06:33:25 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 023918d..3c1fa47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@ xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
 #require_fpic_instead_of_fpie.patch
 #try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
 #make_qglobal_h_complain_if_you_use_fpie.patch
+enable_pie.patch
 fixes_crash_in_bmp_and_ico_image_decoders.patch
 fixes_crash_in_gif_image_decoder.patch
 tst_QNetworkDiskCache-Stop-using-actual-web-servers.patch
@@ -21,7 +22,6 @@ no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 
 # Ubuntu specific.
-enable_pie.patch # drop if switching to -reduce-relocations
 disable_overlay_scrollbars.diff
 qt5-qmake-arm-linux-gnueabihf
 Add-workaround-for-GL-on-Android-emulator.patch

-- 
qtbase packaging