[SCM] kio packaging branch, master, updated. debian/5.19.0-1-38-gcdd907e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c642e8f8f54a3863c7dba187ab074e273b27aa83
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Mon May 16 00:35:57 2016 +0200

    Refresh patches
---
 debian/patches/fix_hurd_build.patch            | 27 +++++++++++++++++---------
 debian/patches/fix_kfreebsd_build              |  2 +-
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 26 +++++++++++++------------
 debian/patches/wait_for_a_bit_longer           |  4 ++--
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index 7a43335..b43fc85 100644
--- a/debian/patches/fix_hurd_build.patch
+++ b/debian/patches/fix_hurd_build.patch
@@ -1,15 +1,22 @@
-Description: fix FTBGS on hurd.
- posix_fadvise64 is not available on hurd, will yield to an compiler warning and
- aborting the build through --fatal-warnings
-Author: Tobias Frost <tobi at debian.org>
+From: Tobias Frost <tobi at debian.org>
+Date: Sun, 15 May 2016 21:03:09 +0200
+Subject: fix_hurd_build
+
+posix_fadvise64 is not available on hurd, will yield to an compiler warning and
+aborting the build through --fatal-warnings
+
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799619
 Forwarded: no
-Last-Update: 2016-04-26
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ src/ioslaves/file/file.cpp      | 2 +-
+ src/ioslaves/file/file_unix.cpp | 4 ++--
+ 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
 --- a/src/ioslaves/file/file.cpp
 +++ b/src/ioslaves/file/file.cpp
-@@ -333,7 +333,7 @@
+@@ -340,7 +340,7 @@ void FileProtocol::get(const QUrl &url)
          return;
      }
  
@@ -18,9 +25,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      //TODO check return code
      posix_fadvise(f.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
  #endif
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index d901a63..ed86549 100644
 --- a/src/ioslaves/file/file_unix.cpp
 +++ b/src/ioslaves/file/file_unix.cpp
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl,
          return;
      }
  
@@ -29,7 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      posix_fadvise(src_file.handle(), 0, 0, POSIX_FADV_SEQUENTIAL);
  #endif
  
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl,
          return;
      }
  
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index 04fb51e..fb84924 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -8,7 +8,7 @@ Subject: fix_kfreebsd_build
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index 59e189f..4f7d891 100644
+index d0a2faa..66d6c04 100644
 --- a/src/widgets/kpropertiesdialog.cpp
 +++ b/src/widgets/kpropertiesdialog.cpp
 @@ -76,6 +76,10 @@
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index ce218a4..40219b6 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -1,17 +1,19 @@
-Description: add search paths for kdelibs4 docs
-Author: Jonathan Riddell
-Origin: me
+From: Jonathan Riddell <jr at jriddell.org>
+Date: Sun, 15 May 2016 21:03:09 +0200
+Subject: kubuntu_kdelibs4-docs-path
+
+add search paths for kdelibs4 docs
+
 Forwarded: no, kdelibs4 path was set in debian/kubuntu packages
-Applied-Upstream: nope
-Reviewed-by: Jonathan Riddell
-Last-Update: 2015-03-01
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: kio/src/ioslaves/help/kio_help.cpp
-===================================================================
---- kio.orig/src/ioslaves/help/kio_help.cpp
-+++ kio/src/ioslaves/help/kio_help.cpp
-@@ -50,7 +50,8 @@ QString HelpProtocol::langLookup(const Q
+ src/ioslaves/help/kio_help.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp
+index f555840..9a7b2fc 100644
+--- a/src/ioslaves/help/kio_help.cpp
++++ b/src/ioslaves/help/kio_help.cpp
+@@ -50,7 +50,8 @@ QString HelpProtocol::langLookup(const QString &fname)
      QStringList search;
  
      // assemble the local search paths
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
index 49e1635..42fe67b 100644
--- a/debian/patches/wait_for_a_bit_longer
+++ b/debian/patches/wait_for_a_bit_longer
@@ -8,10 +8,10 @@ Subject: wait_for_a_bit_longer
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/autotests/kdirlistertest.cpp b/autotests/kdirlistertest.cpp
-index 15e9e52..63550e1 100644
+index a91988f..e0a616b 100644
 --- a/autotests/kdirlistertest.cpp
 +++ b/autotests/kdirlistertest.cpp
-@@ -1178,7 +1178,7 @@ void KDirListerTest::testRemoveWatchedDirectory()
+@@ -1186,7 +1186,7 @@ void KDirListerTest::testRemoveWatchedDirectory()
      QVERIFY(QDir().rmdir(path + "abc"));
  
      // This should trigger an update.

-- 
kio packaging