[SCM] Qt 4 packaging branch, wheezy, updated. debian/4.8.2+dfsg-5-3-g69ba23b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the wheezy branch:
commit 69ba23bb72d94cf7f81dbab0f6f85df4f70d0756
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Dec 17 22:04:57 2012 -0300

    Do not use precompiled headers on ia64.
---
 debian/changelog |    2 ++
 debian/rules     |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 237c2e0..819d81c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qt4-x11 (4:4.8.2+dfsg-6) UNRELEASED; urgency=low
   * Hopefully fix ia64 FTBFS:
     - Remove add-winvalid.patch. Stephan Schreiber has determined the problem
       with the precompiled headers on ia64. Thanks *a lot* Stephan.
+    - Apply the changes suggested by Stephan to avoid using pre compiled
+      headers just on ia64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Dec 2012 21:47:47 -0300
 
diff --git a/debian/rules b/debian/rules
index 1eb26b7..c929169 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,10 @@ else
   endif
 endif
 
+ifeq ($(DEB_HOST_ARCH),ia64)
+	extra_configure_opts += -no-pch
+endif
+
 %:
 	dh $@ --with pkgkde_symbolshelper
 

-- 
Qt 4 packaging