[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git49-gbc62005+dfsg-1-10-g3f65bac

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit a5fa6a767edc57562531f92cb83fe09c1e7fc0de
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Aug 23 12:05:40 2014 -0300

    Add ppc64el to 07_trust_dpkg-arch_over_uname-m.diff.
    
    uname's output differs from the arch's name.
---
 debian/changelog                                    | 3 +++
 debian/patches/07_trust_dpkg-arch_over_uname-m.diff | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0fb947e..6aecc1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-2) UNRELEASED; urgency=medium
       to implement them, as it seems to be possible to do it in a faster way,
       but should work non the less until we can provide something better.
     - Add arm64's mkspecs.
+  * Add support for ppc64el (Closes: #749743).
+    - Add ppc64el to 07_trust_dpkg-arch_over_uname-m.diff, as the uname output
+      differs from the arch name.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Aug 2014 12:02:33 -0300
 
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 2c1d0fe..62e19d9 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -8,7 +8,7 @@ Trolltech task ID : 181882
 
 --- a/configure
 +++ b/configure
-@@ -247,7 +247,50 @@ DeviceVar()
+@@ -247,7 +247,53 @@ DeviceVar()
  #-------------------------------------------------------------------------------
  
  # need that throughout the script
@@ -51,6 +51,9 @@ Trolltech task ID : 181882
 +	powerpc)
 +		UNAME_MACHINE="ppc"
 +	;;
++	ppc64el)
++		UNAME_MACHINE="ppc64le"
++	;;
 +	*)
 +		UNAME_MACHINE="$DPKG_ARCH"
 +	;;

-- 
Qt 4 packaging