[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-5-1-g9468ebf

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 9468ebfb9bc2aa5e774b5e92aa91534dd4caed81
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu May 20 11:00:07 2010 +0300

    Update debian/rules: add -arch armv6 configure option on armel
    architecture to use armv6 specific files (defines QT_ARCH_ARMV6).
---
 debian/changelog |    7 +++++++
 debian/rules     |    4 ++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 709e401..382f7f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.6.2-6) UNRELEASED; urgency=low
+
+  * Update debian/rules: add -arch armv6 configure option on armel
+    architecture to use armv6 specific files (defines QT_ARCH_ARMV6).
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 20 May 2010 10:43:58 +0300
+
 qt4-x11 (4:4.6.2-5) unstable; urgency=low
 
   [ Modestas Vainius ]
diff --git a/debian/rules b/debian/rules
index e04e4fb..51b435a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,10 @@ ifeq ($(DEB_HOST_ARCH),arm)
 	extra_configure_opts += -DQT_QLOCALE_USES_FCVT
 endif
 
+ifeq ($(DEB_HOST_ARCH),armel)
+    extra_configure_opts += -arch armv6
+endif
+
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifeq ($(DEB_HOST_ARCH),amd64)
 	platform_arg = linux-g++-64

-- 
Qt 4 Debian packaging