[SCM] kio packaging branch, master, updated. debian/5.27.0-1-12-g60b8c76

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 22 10:57:14 UTC 2016


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

The following commit has been merged in the master branch:
commit c978121a1c44502bbba76fea500b23889ec6f292
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Tue Nov 15 15:03:40 2016 +0100

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

diff --git a/debian/patches/fix_hurd_build.patch b/debian/patches/fix_hurd_build.patch
index fd9d816..cff1b83 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 8b17d31..a871623 100644
+index b4fd7f2..db48b29 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 adc96d2..a842e95 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 b570a85..b538c74 100644
+index 18c8479..d246b05 100644
 --- a/src/widgets/kpropertiesdialog.cpp
 +++ b/src/widgets/kpropertiesdialog.cpp
 @@ -81,6 +81,10 @@
@@ -22,7 +22,7 @@ index b570a85..b538c74 100644
  }
  #endif
  
-@@ -1932,7 +1936,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
+@@ -1933,7 +1937,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
  static bool fileSystemSupportsACL(const QByteArray &path)
  {
      bool fileSystemSupportsACLs = false;

-- 
kio packaging



More information about the pkg-kde-commits mailing list