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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 97ddac04e2c92b76fcdcfb52b31393fe1aa43f98
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Oct 17 09:38:27 2014 +0200

    Remove upstream patches
---
 debian/changelog                               |  2 ++
 debian/patches/series                          |  2 --
 debian/patches/skip_kmountpointtest_if_no_mtab | 16 --------------
 debian/patches/upstream-copyjob.cpp.diff       | 29 --------------------------
 4 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be03527..d3814eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kde4libs (4:4.14.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.14.2).
   * Update symbols files from buildds logs (4:4.14.1-1).
+  * Remove upstream applied patch: skip_kmountpointtest_if_no_mtab
+  * Remove upstream patch: upstream-copyjob.cpp.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Oct 2014 14:02:17 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 209bf0f..672b157 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,5 +28,3 @@ debian_standardsdirtest.diff
 disable_bogus_test.diff
 disable_bogus_tests
 fix_solidlex_destroy_signature.patch
-skip_kmountpointtest_if_no_mtab
-upstream-copyjob.cpp.diff
diff --git a/debian/patches/skip_kmountpointtest_if_no_mtab b/debian/patches/skip_kmountpointtest_if_no_mtab
deleted file mode 100644
index 694e511..0000000
--- a/debian/patches/skip_kmountpointtest_if_no_mtab
+++ /dev/null
@@ -1,16 +0,0 @@
-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()
diff --git a/debian/patches/upstream-copyjob.cpp.diff b/debian/patches/upstream-copyjob.cpp.diff
deleted file mode 100644
index 02564c2..0000000
--- a/debian/patches/upstream-copyjob.cpp.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/kio/kio/copyjob.cpp b/kio/kio/copyjob.cpp
-index 713255b..ec1030c 100644
---- a/kio/kio/copyjob.cpp
-+++ b/kio/kio/copyjob.cpp
-@@ -340,15 +340,21 @@ void CopyJobPrivate::slotResultStating( KJob *job )
-     if ( destinationState == DEST_NOT_STATED ) {
-         if ( m_dest.isLocalFile() ) { //works for dirs as well
-             QString path = m_dest.toLocalFile();
--            if (m_asMethod) {
-+            QFileInfo fileInfo(path);
-+            if (m_asMethod || !fileInfo.exists()) {
-                 // In copy-as mode, we want to check the directory to which we're
-                 // copying. The target file or directory does not exist yet, which
-                 // might confuse KDiskFreeSpaceInfo.
--                path = QFileInfo(path).absolutePath();
-+                path = fileInfo.absolutePath();
-             }
-             KFileSystemType::Type fsType = KFileSystemType::fileSystemType( path );
-             if ( fsType != KFileSystemType::Nfs && fsType != KFileSystemType::Smb  && fsType != KFileSystemType::Ramfs ) {
--                m_freeSpace = KDiskFreeSpaceInfo::freeSpaceInfo( path ).available();
-+                KDiskFreeSpaceInfo freeSpaceInfo = KDiskFreeSpaceInfo::freeSpaceInfo(path);
-+                if (freeSpaceInfo.isValid()) {
-+                    m_freeSpace = freeSpaceInfo.available();
-+                } else {
-+                    kDebug() << "Couldn't determine free space information for" << path;
-+                }
-             }
-             //TODO actually preliminary check is even more valuable for slow NFS/SMB mounts,
-             //but we need to find a way to report connection errors to user

-- 
KDE Development Platform Libraries module packaging