[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.14.0-1-5-gc1e385f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=9c5429f

The following commit has been merged in the master branch:
commit 9c5429f4a1e90bcab243e562ad08c6469349cf45
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Sep 16 10:38:37 2014 +0200

    New patch: skip_kmountpointtest_if_no_mtab
---
 debian/changelog                               |  1 +
 debian/patches/series                          |  1 +
 debian/patches/skip_kmountpointtest_if_no_mtab | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8b79d72..b7424e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kde4libs (4:4.14.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.14.1).
+  * New patch: skip_kmountpointtest_if_no_mtab
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 20:30:45 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 672b157..55548a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ debian_standardsdirtest.diff
 disable_bogus_test.diff
 disable_bogus_tests
 fix_solidlex_destroy_signature.patch
+skip_kmountpointtest_if_no_mtab
diff --git a/debian/patches/skip_kmountpointtest_if_no_mtab b/debian/patches/skip_kmountpointtest_if_no_mtab
new file mode 100644
index 0000000..694e511
--- /dev/null
+++ b/debian/patches/skip_kmountpointtest_if_no_mtab
@@ -0,0 +1,16 @@
+Index: kde4libs/kdecore/tests/kmountpointtest.cpp
+===================================================================
+--- kde4libs.orig/kdecore/tests/kmountpointtest.cpp	2014-09-16 10:24:39.517136285 +0200
++++ kde4libs/kdecore/tests/kmountpointtest.cpp	2014-09-16 18:52:16.174338889 +0200
+@@ -35,7 +35,10 @@
+ void KMountPointTest::testCurrentMountPoints()
+ {
+     const KMountPoint::List mountPoints = KMountPoint::currentMountPoints(KMountPoint::NeedRealDeviceName);
+-    QVERIFY(!mountPoints.isEmpty());
++    if (mountPoints.isEmpty()) { // can happen in chroot jails
++        QSKIP("fstab is empty", SkipAll);
++        return;
++    }
+     KMountPoint::Ptr mountWithDevice;
+     foreach(KMountPoint::Ptr mountPoint, mountPoints) {
+         kDebug() << "Mount: " << mountPoint->mountedFrom()

-- 
KDE Development Platform Libraries module packaging