[SCM] qtsystems packaging branch, master, updated. 00b5912400b45fbcf7486370b08f9c2b4b88fbaf

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit ae8ccae2499d3cb2d24aef9b7311ada85ee42f43
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 15 07:32:38 2014 +0000

    Fix unit test and remove the module version forcing.
    
      * debian/patches/fix_qserviceinterfacedescriptor_unit_test.patch:
        - Fix qserviceinterfacedescriptor unit test
---
 debian/changelog                                   |  4 +--
 ...fix_qserviceinterfacedescriptor_unit_test.patch | 30 ++++++++++++++++++++++
 debian/patches/revert_module_version.patch         | 14 ----------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80d3602..54e4475 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,11 @@ qtsystems-opensource-src (5.0~git20130712-1) UNRELEASED; urgency=low
 
   [ Timo Jyrinki ]
   * Initial release. (Closes: #697509)
-  * debian/patches/revert_module_version.patch:
-    - Revert to non-zero version number
   * debian/patches/add_license_files.patch:
     - Include license files not yet in upstream (submitted for inclusion)
   * debian/patches/build_with_udisk.patch:
     - Build with udisks support
+  * debian/patches/fix_qserviceinterfacedescriptor_unit_test.patch:
+    - Fix qserviceinterfacedescriptor unit test
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Jan 2013 14:15:42 +0200
diff --git a/debian/patches/fix_qserviceinterfacedescriptor_unit_test.patch b/debian/patches/fix_qserviceinterfacedescriptor_unit_test.patch
new file mode 100644
index 0000000..a73020f
--- /dev/null
+++ b/debian/patches/fix_qserviceinterfacedescriptor_unit_test.patch
@@ -0,0 +1,30 @@
+From 0431253ea80ac0dbd43002bb3626c59b531b2aea Mon Sep 17 00:00:00 2001
+From: Alex Blasche <alexander.blasche at digia.com>
+Date: Mon, 16 Dec 2013 16:48:11 +0100
+Subject: [PATCH] Fix qserviceinterfacedescriptor unit test
+
+It seems the debug stream removes a space at its end.
+
+Change-Id: I2a4677d3fd2a136238034ea1a4ea5ed3dd618a86
+Reviewed-by: Robin Burchell <robin+qt at viroteck.net>
+Reviewed-by: Alex Blasche <alexander.blasche at digia.com>
+---
+ .../tst_qserviceinterfacedescriptor.cpp            |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tests/auto/serviceframework/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp b/tests/auto/serviceframework/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp
+index 22085c0..e1d1ffd 100644
+--- a/tests/auto/serviceframework/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp
++++ b/tests/auto/serviceframework/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp
+@@ -345,7 +345,7 @@ void tst_QServiceInterfaceDescriptor::testDebugStream()
+     qInstallMessageHandler(customMsgHandler);
+     qDebug() << valid2 << invalid;
+     QCOMPARE(type, QtDebugMsg);
+-    QCOMPARE(msg,QString::fromLatin1("QServiceInterfaceDescriptor(service=\"name2\", interface=\"interface2 5.6\") QServiceInterfaceDescriptor(invalid) "));
++    QCOMPARE(msg,QString::fromLatin1("QServiceInterfaceDescriptor(service=\"name2\", interface=\"interface2 5.6\") QServiceInterfaceDescriptor(invalid)"));
+     qInstallMessageHandler(0);
+ }
+ #endif
+-- 
+1.7.1
+
diff --git a/debian/patches/revert_module_version.patch b/debian/patches/revert_module_version.patch
deleted file mode 100644
index 1e49550..0000000
--- a/debian/patches/revert_module_version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Revert module version zeroing
- Trying to revert the zeroing since a crash seems to happen without  
- non-zero version number. (https://bugs.launchpad.net/bugs/1178620)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index 8840bd9..3c4fa5e 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -1,3 +1,3 @@
- load(qt_build_config)
- 
--MODULE_VERSION = 0.0.0
-+MODULE_VERSION = 5.0.0
-

-- 
qtsystems packaging