[SCM] kio packaging branch, master, updated. debian/5.19.0-1-25-g45cb894

Maximiliano Curia maxy at moszumanska.debian.org
Sat Apr 30 07:46:43 UTC 2016


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

The following commit has been merged in the master branch:
commit 06232c381a8fce1fa0f3f11fe8554e7d471202f8
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Sun Apr 10 12:16:38 2016 +0200

    Refresh patches
---
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index 81c4294..ea495c5 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -7,11 +7,11 @@ Subject: kubuntu_kdelibs4-docs-path
  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 f79c801..8fdeb2f 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)
+Index: repo/src/ioslaves/help/kio_help.cpp
+===================================================================
+--- repo.orig/src/ioslaves/help/kio_help.cpp	2016-04-10 12:13:47.395842484 +0200
++++ repo/src/ioslaves/help/kio_help.cpp	2016-04-10 12:13:47.391842642 +0200
+@@ -50,7 +50,8 @@
      QStringList search;
  
      // assemble the local search paths
@@ -19,5 +19,5 @@ index f79c801..8fdeb2f 100644
 +    QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
 +    localDoc << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,QStringLiteral("doc/kde/HTML"), QStandardPaths::LocateDirectory);
  
-     QStringList langs = QLocale().uiLanguages();
+     QStringList langs = KLocalizedString::languages();
      langs.append(QStringLiteral("en"));

-- 
kio packaging



More information about the pkg-kde-commits mailing list