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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit b48fc420df6159761fe5a0f70cb4c88d2b367269
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 6 12:34:29 2014 +0400

    New patch: endianness.diff.
---
 debian/changelog               |  2 ++
 debian/patches/endianness.diff | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b8ec772..f4e1c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qbs (1.3.1+dfsg-2) UNRELEASED; urgency=medium
   * Enable disable_rpath and qbs_enable_project_file_updates
     configuration flags, thanks Adam Majer for the patch
     (really closes: #763365).
+  * Add a patch to correctly detect endianness of all supported
+    by Debian architectures.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Oct 2014 11:48:38 +0400
 
diff --git a/debian/patches/endianness.diff b/debian/patches/endianness.diff
new file mode 100644
index 0000000..9ff40df
--- /dev/null
+++ b/debian/patches/endianness.diff
@@ -0,0 +1,39 @@
+Description: detect endianness of all Debian supported archs
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not yet
+Last-Update: 2014-10-06
+
+--- a/qbs/qbs-1.3.1/src/lib/corelib/tools/hostosinfo.h
++++ b/qbs/qbs-1.3.1/src/lib/corelib/tools/hostosinfo.h
+@@ -165,6 +165,9 @@
+     archMap.insert(QLatin1String("ppc64"), QStringList()
+         << QLatin1String("powerpc64"));
+ 
++    archMap.insert(QLatin1String("ppc64le"), QStringList()
++        << QLatin1String("powerpc64le"));
++
+     QMapIterator<QString, QStringList> i(archMap);
+     while (i.hasNext()) {
+         i.next();
+@@ -183,14 +186,19 @@
+             << QLatin1String("x86")
+             << QLatin1String("x86_64")
+             << QLatin1String("arm")
+-            << QLatin1String("arm64");
++            << QLatin1String("arm64")
++            << QLatin1String("mipsel")
++            << QLatin1String("ppc64le");
+ 
+     if (little.contains(canonicalArch))
+         return QLatin1String("little");
+ 
+     QStringList big = QStringList()
++            << QLatin1String("mips")
+             << QLatin1String("ppc")
+-            << QLatin1String("ppc64");
++            << QLatin1String("ppc64")
++            << QLatin1String("s390x")
++            << QLatin1String("sparc");
+ 
+     if (big.contains(canonicalArch))
+         return QLatin1String("big");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4101251
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+endianness.diff

-- 
qbs packaging