[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-3-14-g8fa4460

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit a4ac8523bc4eae8ca3c46fae211cd7c27a2b24e3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 8 19:04:24 2015 -0300

    Remove ppc64el_configure_support.patch.
    
    Applied upstream.
---
 debian/changelog                               |  1 +
 debian/patches/ppc64el_configure_support.patch | 31 --------------------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81233b9..55d703f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-1) UNRELEASED; urgency=medium
   * Remove patches applied upstream:
     - aarch64_arm64_fix_arch_detection.patch
     - fix_libmng_test.patch
+    - ppc64el_configure_support.patch
 
   [ Dmitry Shachnev ]
   * Make qt4-qmake suggest libqtcore4, as that package contains configuration
diff --git a/debian/patches/ppc64el_configure_support.patch b/debian/patches/ppc64el_configure_support.patch
deleted file mode 100644
index 9fff7ba..0000000
--- a/debian/patches/ppc64el_configure_support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Subject: Add configure support for ppc64el
-Origin: vendor, http://launchpadlibrarian.net/159898800/qt4-x11_4:4.8.4+dfsg-0ubuntu20_4:4.8.4+dfsg-0ubuntu21.diff.gz
-Author: William Grant <wgrant at ubuntu.com>
-Author: Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com>
-Last-Update: 2014-08-22
-Forwarded: https://codereview.qt-project.org/#/c/93060/
-
-This patch was originally introduced [1] and rebased [2] in Ubuntu Trusty [3].
-
-Some chunks were changed/removed on Debian:
-  - The DPKG_ARCH / UNAME_MACHINE mapping is actually Debian-specific, and done
-    in another patch; so this chunk is now there.
-  - The 'PLATFORM=qws/linux-*-g++' setting is not required; ppc64el builds fine
-    with the default 'linux-generic-g++'  (the difference to the previously set
-    'linux-x86_64-g++' is just '-m64', which is default/only-option on ppc64el).
-
-[1] http://launchpadlibrarian.net/159898800/qt4-x11_4:4.8.4+dfsg-0ubuntu20_4:4.8.4+dfsg-0ubuntu21.diff.gz
-[2] http://launchpadlibrarian.net/162331250/qt4-x11_4:4.8.4+dfsg-0ubuntu22_4:4.8.5+git192-g085f851+dfsg-2ubuntu1.diff.gz
-[3] https://launchpad.net/ubuntu/+source/qt4-x11/+changelog
-
---- a/configure
-+++ b/configure
-@@ -3283,7 +3283,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
-         fi
-         CFG_HOST_ARCH=powerpc
-         ;;
--    *:*:ppc64)
-+    *:*:ppc64*)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
-             echo "    64-bit PowerPC (powerpc)"
-         fi
diff --git a/debian/patches/series b/debian/patches/series
index da7cd60..59a5578 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,5 +50,4 @@ qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
 qtdoc-build-offline-docs.patch
 remove_addsense.patch
 parisc-atomic.patch
-ppc64el_configure_support.patch
 cve-2015-0295.diff

-- 
Qt 4 packaging