[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8531034a01d98436ba40d6fdc44d1bbaaba857d2
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 20 23:33:18 2013 +0100

    rules: small simplification in the platform_arg (mkspec) selection
---
 debian/changelog | 1 +
 debian/rules     | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55f5093..ce9f109 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Further fix for MIPS, also in the orderedMemoryFence implementation;
     patch mips_more_pre-mips32.diff.
+  * rules: small simplification in the platform_arg (mkspec) selection.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Dec 2013 21:31:31 +0100
 
diff --git a/debian/rules b/debian/rules
index 1aeabe2..6988a91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,12 +73,10 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
   else
 	platform_arg = linux-g++
   endif
-else
-  ifeq ($(DEB_HOST_ARCH_OS),hurd)
+else ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	platform_arg = hurd-g++
-  else
+else
 	platform_arg = glibc-g++
-  endif
 endif
 
 %:

-- 
qtbase packaging