[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-6-5-gf5289df

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f5289df3049645915f58655e1377aae1aed1bac3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jun 25 23:24:18 2013 -0300

    The -arch and -host-arch options are obsolete.
---
 debian/changelog |    2 ++
 debian/rules     |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91a7dca..353108b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtbase-opensource-src (5.0.2+dfsg1-7) UNRELEASED; urgency=low
   * Mark libgbm-dev as linux-any. Other OSs do not have it.
   * Add the qkms plugin to the armhf list of files to install.
   * Update symbols files.
+  * From the armhf build log: "The -arch and -host-arch options are obsolete".
+    Remove the relevant armv6 option from debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Jun 2013 09:48:33 -0300
 
diff --git a/debian/rules b/debian/rules
index 8a3c29d..2ed513d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,9 +57,6 @@ armv6_architectures := armhf
 ifeq ($(vendor),Ubuntu)
 	armv6_architectures += armel
 endif
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
-	extra_configure_opts += -arch armv6
-endif
 
 gles2_architectures := armel armhf
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))

-- 
qtbase packaging