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

Didier Raboud odyx-guest at alioth.debian.org
Wed Feb 10 09:43:24 UTC 2010


The following commit has been merged in the master branch:
commit 9ec572e1344ade73e5a34d9ce4a037fd3740200e
Author: Didier Raboud <didier at raboud.com>
Date:   Wed Feb 10 10:34:26 2010 +0100

    * Patches: - Refresh kubuntu_01_document_path.diff
---
 debian/changelog                             |    2 ++
 debian/patches/kubuntu_01_document_path.diff |   13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d1ba29..897dfe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kdebluetooth (1:0.4.1-1) UNRELEASED; urgency=low
   * Merging from Ubuntu:
     - Raise an exception and exit when DBus is unavailable rather than
       crashing (LP: #139154)
+  * Patches:
+    - Refresh kubuntu_01_document_path.diff
   * Bump Standards-Version, no changes needed.
 
  -- Didier Raboud <didier at raboud.com>  Wed, 10 Feb 2010 09:55:11 +0100
diff --git a/debian/patches/kubuntu_01_document_path.diff b/debian/patches/kubuntu_01_document_path.diff
index fca9f08..6f988ab 100644
--- a/debian/patches/kubuntu_01_document_path.diff
+++ b/debian/patches/kubuntu_01_document_path.diff
@@ -1,14 +1,15 @@
-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>
+Index: kdebluetooth-0.4/src/trayicon.cpp
+===================================================================
+--- kdebluetooth-0.4.orig/src/trayicon.cpp	2010-02-01 15:37:39.000000000 -0500
++++ kdebluetooth-0.4/src/trayicon.cpp	2010-02-01 18:06:38.057388962 -0500
+@@ -57,6 +57,7 @@
  #include <KApplication>
+ #include <KStandardAction>
  #include <kwallet.h>
 +#include <kglobalsettings.h>
  
  using KWallet::Wallet;
- KBlueTray::KBlueTray(const QString& path, QObject* parent) : KNotificationItem(parent), agentPath(path)
+ KBlueTray::KBlueTray(const QString& path, QObject* parent) : KNotificationItem(parent), agentPath(path),m_aboutDialog(0)
 @@ -199,13 +200,7 @@
  	confGroup = new KConfigGroup(config, "General");
  	KConfigGroup obexServerConfig(config, "ObexServer");

-- 
Debian packaging for kdebluetooth4



More information about the pkg-kde-commits mailing list