[SCM] qbs packaging branch, master, updated. debian/1.3.1+dfsg-3-4-ge1ec524

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit e1ec524ba1af1aefab8b6e2e4a2c7d838f8d9ccf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 14 19:10:14 2014 +0400

    Add arm64 support.
---
 debian/changelog               |  1 +
 debian/patches/endianness.diff | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f17ace8..c86488f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.3.1+dfsg-4) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Add upstream patch to not hardcode the linker hash style.
+  * Add arm64 support.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Oct 2014 21:37:12 +0400
 
diff --git a/debian/patches/endianness.diff b/debian/patches/endianness.diff
index 2d08c3c..711e4d7 100644
--- a/debian/patches/endianness.diff
+++ b/debian/patches/endianness.diff
@@ -1,11 +1,21 @@
 Description: detect endianness of all Debian supported archs
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-yet
-Last-Update: 2014-10-06
+Last-Update: 2014-10-14
 
 --- a/src/lib/corelib/tools/hostosinfo.h
 +++ b/src/lib/corelib/tools/hostosinfo.h
-@@ -165,6 +165,9 @@
+@@ -155,6 +155,9 @@
+         << QLatin1String("intel64")
+         << QLatin1String("mingw64"));
+ 
++    archMap.insert(QLatin1String("arm64"), QStringList()
++        << QLatin1String("aarch64"));
++
+     archMap.insert(QLatin1String("ia64"), QStringList()
+         << QLatin1String("ia-64")
+         << QLatin1String("itanium"));
+@@ -165,6 +168,9 @@
      archMap.insert(QLatin1String("ppc64"), QStringList()
          << QLatin1String("powerpc64"));
  
@@ -15,7 +25,7 @@ Last-Update: 2014-10-06
      QMapIterator<QString, QStringList> i(archMap);
      while (i.hasNext()) {
          i.next();
-@@ -183,14 +186,19 @@
+@@ -183,14 +189,19 @@
              << QLatin1String("x86")
              << QLatin1String("x86_64")
              << QLatin1String("arm")

-- 
qbs packaging