[SCM] kio packaging branch, master, updated. debian/5.25.0-1-7-g05d2f10
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Sep 29 15:18:19 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=2f0a602
The following commit has been merged in the master branch:
commit 2f0a6027a12c84a2b8012fdb4ef80212b8e15cb3
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Sat Sep 10 15:04:16 2016 +0200
Refresh patches
---
debian/patches/report_error_removing_dirs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index f341950..8afe601 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -8,7 +8,7 @@ Subject: report_error_removing_dirs
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp
-index 8d6ab05..3d29d0b 100644
+index 12bf409..7dbafee 100644
--- a/src/core/copyjob.cpp
+++ b/src/core/copyjob.cpp
@@ -151,6 +151,7 @@ public:
@@ -28,7 +28,7 @@ index 8d6ab05..3d29d0b 100644
QTimer *m_reportTimer;
-@@ -1711,6 +1714,10 @@ void CopyJobPrivate::setNextDirAttribute()
+@@ -1716,6 +1719,10 @@ void CopyJobPrivate::setNextDirAttribute()
--m_processedFiles; // undo the "start at 1" hack
slotReport(); // display final numbers, important if progress dialog stays up
@@ -39,7 +39,7 @@ index 8d6ab05..3d29d0b 100644
q->emitResult();
}
}
-@@ -1780,12 +1787,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
+@@ -1785,12 +1792,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
{
Q_Q(CopyJob);
--
kio packaging
More information about the pkg-kde-commits
mailing list