[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+git192-g085f851+dfsg-1-2-gb0575f5

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b0575f5f9be083c10eac546d7ec4fe90dd707d59
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Dec 6 16:32:29 2013 -0300

    Fix typo created when refreshing a patch for s390x which created a FTBFS.
---
 debian/changelog                 | 3 +++
 debian/patches/s390x_jscore.diff | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 08a19ba..c98434a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qt4-x11 (4:4.8.5+git192-g085f851+dfsg-2) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Fix typo created when refreshing a patch for s390x which created a FTBFS.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Dec 2013 16:31:27 -0300
 
 qt4-x11 (4:4.8.5+git192-g085f851+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 5a68c64..d904f55 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -34,7 +34,7 @@ Last-Update: 2013-12-05
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
 -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(S390x)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(S390X)
  #define WTF_USE_JSVALUE64 1
  #elif CPU(ARM) || CPU(PPC64)
  #define WTF_USE_JSVALUE32 1

-- 
Qt 4 packaging