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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 677dab544a90ae49a3f5dfb10046dd8aaff1fced
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 15 13:30:46 2014 +0300

    New upstream bugfix release.
---
 debian/changelog                |  5 ++++-
 debian/patches/endianness.diff  |  6 +++---
 debian/patches/no_gnu_hash.diff | 14 --------------
 debian/patches/series           |  2 --
 debian/patches/skip_test.diff   | 16 ----------------
 5 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5869914..d3dac65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-qbs (1.3.2+dfsg-2) UNRELEASED; urgency=medium
+qbs (1.3.3+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
+  * New upstream bugfix release.
+  * Drop no_gnu_hash.diff, applied upstream.
+  * Drop skip_test.diff, no longer needed.
   * Add support for all MIPS flavors (closes: #767459).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 31 Oct 2014 14:53:05 +0300
diff --git a/debian/patches/endianness.diff b/debian/patches/endianness.diff
index 03cb0b6..aae7390 100644
--- a/debian/patches/endianness.diff
+++ b/debian/patches/endianness.diff
@@ -5,7 +5,7 @@ Last-Update: 2014-10-31
 
 --- a/src/lib/corelib/tools/architectures.cpp
 +++ b/src/lib/corelib/tools/architectures.cpp
-@@ -59,6 +59,9 @@
+@@ -61,6 +61,9 @@
          << QLatin1String("intel64")
          << QLatin1String("mingw64"));
  
@@ -15,7 +15,7 @@ Last-Update: 2014-10-31
      archMap.insert(QLatin1String("ia64"), QStringList()
          << QLatin1String("ia-64")
          << QLatin1String("itanium"));
-@@ -69,6 +72,9 @@
+@@ -71,6 +74,9 @@
      archMap.insert(QLatin1String("ppc64"), QStringList()
          << QLatin1String("powerpc64"));
  
@@ -25,7 +25,7 @@ Last-Update: 2014-10-31
      QMapIterator<QString, QStringList> i(archMap);
      while (i.hasNext()) {
          i.next();
-@@ -87,15 +93,27 @@
+@@ -89,15 +95,27 @@
      QStringList little = QStringList()
              << QLatin1String("x86")
              << QLatin1String("x86_64")
diff --git a/debian/patches/no_gnu_hash.diff b/debian/patches/no_gnu_hash.diff
deleted file mode 100644
index 732ec5d..0000000
--- a/debian/patches/no_gnu_hash.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: do not hardcode hash style
-Origin: upstream, https://qt.gitorious.org/qt-labs/qbs/commit/14dd7b7e99705196
-Last-Update: 2014-10-08
-
---- a/share/qbs/modules/cpp/GenericGCC.qbs
-+++ b/share/qbs/modules/cpp/GenericGCC.qbs
-@@ -121,7 +121,6 @@
-             args.push('-shared');
-             if (product.moduleProperty("qbs", "targetOS").contains('linux')) {
-                 args = args.concat([
--                    '-Wl,--hash-style=gnu',
-                     '-Wl,--as-needed',
-                     '-Wl,-soname=' + UnixUtils.soname(product, lib.fileName)
-                 ]);
diff --git a/debian/patches/series b/debian/patches/series
index 0cfb38f..4101251 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 endianness.diff
-skip_test.diff
-no_gnu_hash.diff
diff --git a/debian/patches/skip_test.diff b/debian/patches/skip_test.diff
deleted file mode 100644
index 6f38846..0000000
--- a/debian/patches/skip_test.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: skip failing TestBlackbox::dependenciesProperty() test
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Bug: https://bugreports.qt-project.org/browse/QBS-695
-Forwarded: not-needed
-Last-Update: 2014-10-07
-
---- a/tests/auto/blackbox/tst_blackbox.cpp
-+++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -422,6 +422,7 @@
- 
- void TestBlackbox::dependenciesProperty()
- {
-+    SKIP_TEST("does not pass on most architectures");
-     QDir::setCurrent(testDataDir + QLatin1String("/dependenciesProperty"));
-     QCOMPARE(runQbs(), 0);
-     QFile depsFile(productBuildDir("product1") + QLatin1String("/product1.deps"));

-- 
qbs packaging