[SCM] kio packaging branch, master, updated. debian/5.14.0-1-6-g4a3d4f6

Maximiliano Curia maxy at moszumanska.debian.org
Mon Oct 12 12:30:12 UTC 2015


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

The following commit has been merged in the master branch:
commit 1e91801e3a24cd3dbc6b7ee2a147a2c782b93e14
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Oct 6 16:20:50 2015 +0200

    Refresh patches.
---
 debian/changelog                       | 1 +
 debian/patches/return_on_ACCESS_DENIED | 6 +++---
 debian/patches/wait_for_a_bit_longer   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0fabc6c..b18fcf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kio (5.15.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.15.0).
   * Update symbols files from buildds logs (5.14.0-1).
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 05 Oct 2015 15:07:12 +0200
 
diff --git a/debian/patches/return_on_ACCESS_DENIED b/debian/patches/return_on_ACCESS_DENIED
index 0a95547..9a41599 100644
--- a/debian/patches/return_on_ACCESS_DENIED
+++ b/debian/patches/return_on_ACCESS_DENIED
@@ -1,8 +1,8 @@
 Index: kio/src/ioslaves/file/file_unix.cpp
 ===================================================================
---- kio.orig/src/ioslaves/file/file_unix.cpp	2015-03-08 11:28:41.178350636 +0100
-+++ kio/src/ioslaves/file/file_unix.cpp	2015-03-13 00:19:05.571690751 +0100
-@@ -535,8 +535,8 @@
+--- kio.orig/src/ioslaves/file/file_unix.cpp	2015-10-06 16:18:18.604960597 +0200
++++ kio/src/ioslaves/file/file_unix.cpp	2015-10-06 16:18:18.600960758 +0200
+@@ -536,8 +536,8 @@
              } else {
                  // qDebug() << "could not rmdir " << perror;
                  error(KIO::ERR_CANNOT_RMDIR, path);
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
index f560956..7d6b4a5 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-07-07 10:51:37.441998136 +0200
-+++ kio/autotests/kdirlistertest.cpp	2015-07-07 10:51:37.437998295 +0200
-@@ -1149,7 +1149,7 @@
+--- 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 @@
      QVERIFY(QDir().rmdir(path + "abc"));
  
      // This should trigger an update.

-- 
kio packaging



More information about the pkg-kde-commits mailing list