[SCM] kio packaging branch, master, updated. debian/5.16.0-1-16-g14e1cab

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=1e3fa53

The following commit has been merged in the master branch:
commit 1e3fa530d90b6358926d81f4de9c92bb85d2d312
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 8 12:15:05 2016 +0100

    Refresh patches
---
 debian/patches/fix_kfreebsd_build         | 8 ++++----
 debian/patches/report_error_removing_dirs | 8 ++++----
 debian/patches/wait_for_a_bit_longer      | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index d710204..3f40e49 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -1,10 +1,10 @@
 Index: kio/src/widgets/kpropertiesdialog.cpp
 ===================================================================
---- kio.orig/src/widgets/kpropertiesdialog.cpp	2015-06-29 00:13:31.825361483 +0200
-+++ kio/src/widgets/kpropertiesdialog.cpp	2015-07-07 10:56:53.101498107 +0200
-@@ -75,6 +75,10 @@
- #if HAVE_POSIX_ACL
+--- kio.orig/src/widgets/kpropertiesdialog.cpp	2016-02-08 12:10:30.544431744 +0100
++++ kio/src/widgets/kpropertiesdialog.cpp	2016-02-08 12:10:30.540431907 +0100
+@@ -76,6 +76,10 @@
  extern "C" {
+ #  include <errno.h>
  #  include <sys/xattr.h>
 +#  if defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__)
 +#     include <sys/vfs.h>
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index 0ae19df..f1673dd 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -1,7 +1,7 @@
 Index: kio/src/core/copyjob.cpp
 ===================================================================
---- kio.orig/src/core/copyjob.cpp	2015-03-13 20:28:14.051523378 +0100
-+++ kio/src/core/copyjob.cpp	2015-03-13 20:29:19.672816282 +0100
+--- kio.orig/src/core/copyjob.cpp	2016-02-08 12:10:19.904863055 +0100
++++ kio/src/core/copyjob.cpp	2016-02-08 12:10:19.904863055 +0100
 @@ -146,6 +146,7 @@
          , m_bOverwriteAllFiles(false)
          , m_bOverwriteAllDirs(false)
@@ -19,7 +19,7 @@ Index: kio/src/core/copyjob.cpp
  
      QTimer *m_reportTimer;
  
-@@ -1690,6 +1693,10 @@
+@@ -1704,6 +1707,10 @@
          --m_processedFiles; // undo the "start at 1" hack
          slotReport(); // display final numbers, important if progress dialog stays up
  
@@ -30,7 +30,7 @@ Index: kio/src/core/copyjob.cpp
          q->emitResult();
      }
  }
-@@ -1759,12 +1766,14 @@
+@@ -1773,12 +1780,14 @@
  void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
  {
      Q_Q(CopyJob);
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
index 7d6b4a5..53d5124 100644
--- a/debian/patches/wait_for_a_bit_longer
+++ b/debian/patches/wait_for_a_bit_longer
@@ -1,8 +1,8 @@
 Index: kio/autotests/kdirlistertest.cpp
 ===================================================================
---- kio.orig/autotests/kdirlistertest.cpp	2015-10-06 16:19:52.557181812 +0200
-+++ kio/autotests/kdirlistertest.cpp	2015-10-06 16:19:52.553181973 +0200
-@@ -1143,7 +1143,7 @@
+--- kio.orig/autotests/kdirlistertest.cpp	2016-02-08 12:10:26.216607188 +0100
++++ kio/autotests/kdirlistertest.cpp	2016-02-08 12:10:26.212607350 +0100
+@@ -1178,7 +1178,7 @@
      QVERIFY(QDir().rmdir(path + "abc"));
  
      // This should trigger an update.

-- 
kio packaging