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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 124fa5dae40b0e552e4ca400be937e6e0aa94476
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 20 16:54:18 2014 +0400

    Add alpha, hppa and sparc64 support.
---
 debian/changelog               |  6 ++++++
 debian/patches/endianness.diff | 10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b58127f..688cadc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qbs (1.3.1+dfsg-5) UNRELEASED; urgency=medium
+
+  * Add alpha, hppa and sparc64 support.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 20 Oct 2014 16:53:29 +0400
+
 qbs (1.3.1+dfsg-4) unstable; urgency=medium
 
   * Add upstream patch to not hardcode the linker hash style.
diff --git a/debian/patches/endianness.diff b/debian/patches/endianness.diff
index 711e4d7..ee23348 100644
--- a/debian/patches/endianness.diff
+++ b/debian/patches/endianness.diff
@@ -1,7 +1,7 @@
 Description: detect endianness of all Debian supported archs
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-yet
-Last-Update: 2014-10-14
+Last-Update: 2014-10-20
 
 --- a/src/lib/corelib/tools/hostosinfo.h
 +++ b/src/lib/corelib/tools/hostosinfo.h
@@ -25,9 +25,11 @@ Last-Update: 2014-10-14
      QMapIterator<QString, QStringList> i(archMap);
      while (i.hasNext()) {
          i.next();
-@@ -183,14 +189,19 @@
+@@ -182,15 +188,23 @@
+     QStringList little = QStringList()
              << QLatin1String("x86")
              << QLatin1String("x86_64")
++            << QLatin1String("alpha")
              << QLatin1String("arm")
 -            << QLatin1String("arm64");
 +            << QLatin1String("arm64")
@@ -38,12 +40,14 @@ Last-Update: 2014-10-14
          return QLatin1String("little");
  
      QStringList big = QStringList()
++            << QLatin1String("hppa")
 +            << QLatin1String("mips")
              << QLatin1String("ppc")
 -            << QLatin1String("ppc64");
 +            << QLatin1String("ppc64")
 +            << QLatin1String("s390x")
-+            << QLatin1String("sparc");
++            << QLatin1String("sparc")
++            << QLatin1String("sparc64");
  
      if (big.contains(canonicalArch))
          return QLatin1String("big");

-- 
qbs packaging