[SCM] kio packaging branch, master, updated. debian/5.28.0-1-14-g6a34213
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Apr 5 08:43:38 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=b8aac02
The following commit has been merged in the master branch:
commit b8aac022c1f0f0a367b14f1ae5d5f7d059508830
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Apr 4 17:15:29 2017 +0200
Refresh patches
Gbp-Dch: Ignore
---
debian/patches/fix_hurd_build.patch | 4 ++--
debian/patches/fix_kfreebsd_build | 2 +-
debian/patches/kubuntu_kdelibs4-docs-path.diff | 2 +-
debian/patches/report_error_removing_dirs | 2 +-
debian/patches/return_on_ACCESS_DENIED | 2 +-
debian/patches/wait_for_a_bit_longer | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index cff1b83..00c5f3f 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 b4fd7f2..db48b29 100644
+index b4fd7f20..db48b295 100644
--- a/src/ioslaves/file/file.cpp
+++ b/src/ioslaves/file/file.cpp
@@ -340,7 +340,7 @@ void FileProtocol::get(const QUrl &url)
@@ -26,7 +26,7 @@ index b4fd7f2..db48b29 100644
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
+index d901a63d..ed86549f 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
@@ -128,7 +128,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl,
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index a842e95..c1d3bff 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 18c8479..d246b05 100644
+index 18c8479b..d246b056 100644
--- a/src/widgets/kpropertiesdialog.cpp
+++ b/src/widgets/kpropertiesdialog.cpp
@@ -81,6 +81,10 @@
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index 40219b6..226307b 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -10,7 +10,7 @@ Forwarded: no, kdelibs4 path was set in debian/kubuntu packages
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
+index f5558405..9a7b2fc9 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)
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index 8afe601..0734991 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 12bf409..7dbafee 100644
+index 12bf4092..7dbafee4 100644
--- a/src/core/copyjob.cpp
+++ b/src/core/copyjob.cpp
@@ -151,6 +151,7 @@ public:
diff --git a/debian/patches/return_on_ACCESS_DENIED b/debian/patches/return_on_ACCESS_DENIED
index 237f0f0..8603513 100644
--- a/debian/patches/return_on_ACCESS_DENIED
+++ b/debian/patches/return_on_ACCESS_DENIED
@@ -8,7 +8,7 @@ Subject: return_on_ACCESS_DENIED
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index f2b67ce..d901a63 100644
+index f2b67ce5..d901a63d 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
@@ -536,8 +536,8 @@ void FileProtocol::del(const QUrl &url, bool isfile)
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
index 42fe67b..15f3278 100644
--- a/debian/patches/wait_for_a_bit_longer
+++ b/debian/patches/wait_for_a_bit_longer
@@ -8,7 +8,7 @@ Subject: wait_for_a_bit_longer
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autotests/kdirlistertest.cpp b/autotests/kdirlistertest.cpp
-index a91988f..e0a616b 100644
+index a91988f5..e0a616bf 100644
--- a/autotests/kdirlistertest.cpp
+++ b/autotests/kdirlistertest.cpp
@@ -1186,7 +1186,7 @@ void KDirListerTest::testRemoveWatchedDirectory()
--
kio packaging
More information about the pkg-kde-commits
mailing list