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

Dmitry Shachnev mitya57-guest at moszumanska.debian.org
Mon Oct 20 13:49:55 UTC 2014


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

The following commit has been merged in the master branch:
commit b8c6a92555fe09ada17d4131078708f905a6852a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 20 17:49:50 2014 +0400

    New upstream bugfix release.
---
 debian/changelog               |  3 ++-
 debian/patches/endianness.diff | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12d8d2f..3134cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-qbs (1.3.1+dfsg-5) UNRELEASED; urgency=medium
+qbs (1.3.2+dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream bugfix release.
   * Add alpha, hppa and sparc64 support (closes: #764556).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 20 Oct 2014 16:53:29 +0400
diff --git a/debian/patches/endianness.diff b/debian/patches/endianness.diff
index ee23348..46e3bb4 100644
--- a/debian/patches/endianness.diff
+++ b/debian/patches/endianness.diff
@@ -3,9 +3,9 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-yet
 Last-Update: 2014-10-20
 
---- a/src/lib/corelib/tools/hostosinfo.h
-+++ b/src/lib/corelib/tools/hostosinfo.h
-@@ -155,6 +155,9 @@
+--- a/src/lib/corelib/tools/architectures.cpp
++++ b/src/lib/corelib/tools/architectures.cpp
+@@ -59,6 +59,9 @@
          << QLatin1String("intel64")
          << QLatin1String("mingw64"));
  
@@ -15,7 +15,7 @@ Last-Update: 2014-10-20
      archMap.insert(QLatin1String("ia64"), QStringList()
          << QLatin1String("ia-64")
          << QLatin1String("itanium"));
-@@ -165,6 +168,9 @@
+@@ -69,6 +72,9 @@
      archMap.insert(QLatin1String("ppc64"), QStringList()
          << QLatin1String("powerpc64"));
  
@@ -25,7 +25,7 @@ Last-Update: 2014-10-20
      QMapIterator<QString, QStringList> i(archMap);
      while (i.hasNext()) {
          i.next();
-@@ -182,15 +188,23 @@
+@@ -87,15 +93,23 @@
      QStringList little = QStringList()
              << QLatin1String("x86")
              << QLatin1String("x86_64")

-- 
qbs packaging



More information about the pkg-kde-commits mailing list