[SCM] kdenetwork-filesharing packaging branch, master, updated. debian/15.12.1-2-5-gf48bc26

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenetwork-filesharing.git;a=commitdiff;h=1ec0fd5

The following commit has been merged in the master branch:
commit 1ec0fd56326e94bbf01effbe52532d10773c40f4
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jun 9 21:43:08 2016 +0200

    fix detection of smbd (#826851)
    
    backport upstream commit fb48a2e997eb76ff2eeff1e69c2db35478c2f0c0
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  1 +
 .../upstream_Sync-smbd-detection-with-kio.patch    | 48 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c0aec1..d34923b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ kdenetwork-filesharing (4:16.04.1-0r1) UNRELEASED; urgency=medium
   * Stop forcing the local installation to debian/tmp, letting the package
     directory as install place.
     - remove kdenetwork-filesharing.install, no more used now
+  * Backport upstream commit fb48a2e997eb76ff2eeff1e69c2db35478c2f0c0 to fix
+    detection of smbd; patch upstream_Sync-smbd-detection-with-kio.patch.
+    (Closes: #826851)
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 Jun 2016 16:22:30 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b2487e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Sync-smbd-detection-with-kio.patch
diff --git a/debian/patches/upstream_Sync-smbd-detection-with-kio.patch b/debian/patches/upstream_Sync-smbd-detection-with-kio.patch
new file mode 100644
index 0000000..9e4f81f
--- /dev/null
+++ b/debian/patches/upstream_Sync-smbd-detection-with-kio.patch
@@ -0,0 +1,48 @@
+From fb48a2e997eb76ff2eeff1e69c2db35478c2f0c0 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Thu, 9 Jun 2016 21:37:00 +0200
+Subject: [PATCH] Sync smbd detection with kio
+
+Copy the helper KSambaSharePrivate::isSambaInstalled() from kio, so
+this file properties plugin has the same logic as the KSambaShare code
+used.
+---
+ samba/filepropertiesplugin/sambausershareplugin.cpp | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/samba/filepropertiesplugin/sambausershareplugin.cpp b/samba/filepropertiesplugin/sambausershareplugin.cpp
+index dba0388..1833df3 100644
+--- a/samba/filepropertiesplugin/sambausershareplugin.cpp
++++ b/samba/filepropertiesplugin/sambausershareplugin.cpp
+@@ -40,6 +40,19 @@
+ K_PLUGIN_FACTORY(SambaUserSharePluginFactory, registerPlugin<SambaUserSharePlugin>();)
+ K_EXPORT_PLUGIN(SambaUserSharePluginFactory("fileshare_propsdlgplugin"))
+ 
++// copied from kio/src/core/ksambashare.cpp, KSambaSharePrivate::isSambaInstalled()
++static bool isSambaInstalled()
++{
++    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
++            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
++        return true;
++    }
++
++    //qDebug() << "Samba is not installed!";
++
++    return false;
++}
++
+ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent, const QList<QVariant> &args)
+     : KPropertiesDialogPlugin(qobject_cast<KPropertiesDialog *>(parent))
+     , m_url(properties->url().toLocalFile())
+@@ -105,7 +118,7 @@ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent, const QList<QVariant
+     for (int i = 0; i < model->rowCount(); ++i) {
+         propertiesUi.tableView->openPersistentEditor(model->index(i, 1, QModelIndex()));
+     }
+-    if (QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty()) {
++    if (!isSambaInstalled()) {
+         m_installSambaWidgets->show();
+         m_shareWidgets->hide();
+     } else {
+-- 
+2.8.1
+

-- 
kdenetwork-filesharing packaging