[SCM] Debian packaging for kdebluetooth4 branch, master, updated. debian/0.3-1-10-g546f027

[Michael Meskes]

The following commit has been merged in the master branch:
commit 097aa6d5b8108f09a3641ba1252d351c1c200d3e
Author: Michael Meskes <meskes at debian.org>
Date:   Sat Oct 24 18:56:35 2009 +0200

    Replaced old save-directory patch with new one. Taken from Ubuntu as well.
---
 debian/patches/kubuntu_01_document_path.diff |   26 ++++++++++++++++++++++++++
 debian/patches/kubuntu_01_save_to_home.diff  |   16 ----------------
 debian/patches/series                        |    2 +-
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/debian/patches/kubuntu_01_document_path.diff b/debian/patches/kubuntu_01_document_path.diff
new file mode 100644
index 0000000..fca9f08
--- /dev/null
+++ b/debian/patches/kubuntu_01_document_path.diff
@@ -0,0 +1,26 @@
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-0.4~beta1b/src/trayicon.cpp kdebluetooth-0.4~beta1b.new/src/trayicon.cpp
+--- kdebluetooth-0.4~beta1b/src/trayicon.cpp	2009-09-18 03:14:27.000000000 +0200
++++ kdebluetooth-0.4~beta1b.new/src/trayicon.cpp	2009-09-29 09:37:27.177320178 +0200
+@@ -55,6 +55,7 @@
+ #include <KMenu>
+ #include <KApplication>
+ #include <kwallet.h>
++#include <kglobalsettings.h>
+ 
+ using KWallet::Wallet;
+ KBlueTray::KBlueTray(const QString& path, QObject* parent) : KNotificationItem(parent), agentPath(path)
+@@ -199,13 +200,7 @@
+ 	confGroup = new KConfigGroup(config, "General");
+ 	KConfigGroup obexServerConfig(config, "ObexServer");
+ 	if(!obexServerConfig.hasKey("savePath")) {
+-		QString saveUrl;
+-		KDirSelectDialog dirs;
+-		if(dirs.exec() && dirs.url().isValid()) {
+-			saveUrl = dirs.url().path();
+-		}else{
+-			saveUrl = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+-		}
++		QString saveUrl=KGlobalSettings::documentPath();
+ 		obexServerConfig.writeEntry("savePath",saveUrl);
+ 		obexServerConfig.sync();
+ 	}
diff --git a/debian/patches/kubuntu_01_save_to_home.diff b/debian/patches/kubuntu_01_save_to_home.diff
deleted file mode 100644
index 73cbc0a..0000000
--- a/debian/patches/kubuntu_01_save_to_home.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Ubuntu: https://bugs.launchpad.net/bugs/334136
-# Upstream: https://bugs.kde.org/show_bug.cgi?id=172217
-# Description: save received files to $HOME and not $HOME/.kbluetooth4
-#
---- a/src/trayicon.cpp
-+++ b/src/trayicon.cpp
-@@ -643,7 +643,7 @@ void KBlueTray::slotPropertyChanged(cons
- 
- void KBlueTray::slotServerReady() {
- 	if(!server->isStarted())
--		server->start(QDir::homePath()+"/.kbluetooth4", true, false);
-+		server->start(QDir::homePath(), true, false);
- }
- 
- void KBlueTray::slotServerErrorOccured(const QString& error_name, const QString& error_message) {
diff --git a/debian/patches/series b/debian/patches/series
index 38eac85..4a58264 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-kubuntu_01_save_to_home.diff
+kubuntu_01_document_path.diff

-- 
Debian packaging for kdebluetooth4