[SCM] kio packaging branch, master, updated. debian/5.23.0-1-13-g2af0546

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit beedaccf7c7a3900f2d434cc98b0f3ff5160c737
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Sat Aug 13 21:03:34 2016 +0200

    Refresh patches
---
 debian/patches/fix_hurd_build.patch       |  2 +-
 debian/patches/fix_kfreebsd_build         |  6 +++---
 debian/patches/report_error_removing_dirs | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index b43fc85..fd9d816 100644
--- a/debian/patches/fix_hurd_build.patch
+++ b/debian/patches/fix_hurd_build.patch
@@ -13,7 +13,7 @@ Forwarded: no
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/ioslaves/file/file.cpp b/src/ioslaves/file/file.cpp
-index 9a8ca32..06bce64 100644
+index 8b17d31..a871623 100644
 --- a/src/ioslaves/file/file.cpp
 +++ b/src/ioslaves/file/file.cpp
 @@ -340,7 +340,7 @@ void FileProtocol::get(const QUrl &url)
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index fb84924..1d61612 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -8,10 +8,10 @@ Subject: fix_kfreebsd_build
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index d0a2faa..66d6c04 100644
+index cdc2154..b21d91e 100644
 --- a/src/widgets/kpropertiesdialog.cpp
 +++ b/src/widgets/kpropertiesdialog.cpp
-@@ -76,6 +76,10 @@
+@@ -81,6 +81,10 @@
  extern "C" {
  #  include <errno.h>
  #  include <sys/xattr.h>
@@ -22,7 +22,7 @@ index d0a2faa..66d6c04 100644
  }
  #endif
  
-@@ -1915,7 +1919,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
+@@ -1922,7 +1926,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
  static bool fileSystemSupportsACL(const QByteArray &path)
  {
      bool fileSystemSupportsACLs = false;
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index 05cbd83..f341950 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -8,10 +8,10 @@ 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 f6849fc..6b36cc6 100644
+index 8d6ab05..3d29d0b 100644
 --- a/src/core/copyjob.cpp
 +++ b/src/core/copyjob.cpp
-@@ -146,6 +146,7 @@ public:
+@@ -151,6 +151,7 @@ public:
          , m_bOverwriteAllFiles(false)
          , m_bOverwriteAllDirs(false)
          , m_conflictError(0)
@@ -19,7 +19,7 @@ index f6849fc..6b36cc6 100644
          , m_reportTimer(0)
      {
      }
-@@ -200,6 +201,8 @@ public:
+@@ -205,6 +206,8 @@ public:
      bool m_bOverwriteAllFiles;
      bool m_bOverwriteAllDirs;
      int m_conflictError;
@@ -28,7 +28,7 @@ index f6849fc..6b36cc6 100644
  
      QTimer *m_reportTimer;
  
-@@ -1704,6 +1707,10 @@ void CopyJobPrivate::setNextDirAttribute()
+@@ -1711,6 +1714,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 f6849fc..6b36cc6 100644
          q->emitResult();
      }
  }
-@@ -1773,12 +1780,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
+@@ -1780,12 +1787,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
  void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
  {
      Q_Q(CopyJob);

-- 
kio packaging