[SCM] Qt 4 packaging branch, master, updated. debian/4.8.1-1-6-g387f8e6

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 387f8e6ccfca84e584d944ef87dc8a1695a4da64
Author: Pino Toscano <pino at debian.org>
Date:   Sat May 19 00:39:10 2012 +0200

    07_trust_dpkg-arch_over_uname-m.diff: fix the hppa case (see #672825)
---
 debian/changelog                                   |    1 +
 .../patches/07_trust_dpkg-arch_over_uname-m.diff   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df778a4..7846f2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qt4-x11 (4:4.8.1-2) UNRELEASED; urgency=low
   * Backport the upstream commit 9e981c4dd03effc2c52b52f529edfa8955e534ce to
     fix plugin loading on big endian 64 bit architectures, such as s390x and
     ppc64; patch QElfParser-fix-type-of-sh_size.patch.
+  * 07_trust_dpkg-arch_over_uname-m.diff: fix the hppa case (see bug #672825).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 May 2012 21:58:22 +0200
 
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 d3f071c..3f6b101 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -28,7 +28,7 @@ Trolltech task ID : 181882
 +		UNAME_MACHINE="armv5tel"
 +	;;
 +	hppa)
-+		UNAME_MACHINE="parisc64"
++		UNAME_MACHINE="parisc"
 +	;;
 +	hurd-i386)
 +		UNAME_MACHINE="i686-AT386"

-- 
Qt 4 packaging