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

[Didier Raboud]

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

    * Merging from Ubuntu: Raise an exception and exit when DBus is unavailable rather than crashing (LP: #139154)
---
 debian/changelog  |    3 +++
 debian/kblueplugd |    9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e811c14..8d1ba29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ kdebluetooth (1:0.4.1-1) UNRELEASED; urgency=low
 
   * Imported upstream version 0.4.1
   * Change Homepage from SourceForge to KDE-Apps.org
+  * Merging from Ubuntu:
+    - Raise an exception and exit when DBus is unavailable rather than
+      crashing (LP: #139154)
   * Bump Standards-Version, no changes needed.
 
  -- Didier Raboud <didier at raboud.com>  Wed, 10 Feb 2010 09:55:11 +0100
diff --git a/debian/kblueplugd b/debian/kblueplugd
index 7a6a080..dd6f80a 100644
--- a/debian/kblueplugd
+++ b/debian/kblueplugd
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 """
 Copyright (C) 2007 Achim Bohnet <allee at kubuntu.org>
 
@@ -22,7 +22,12 @@ quitprogs = [ 'kbluetooth' ]
 app = Qt.QCoreApplication(sys.argv)
 	
 dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
-bus = dbus.SystemBus()
+
+try:
+        bus = dbus.SystemBus()
+except:
+        print "Unable to connect to the DBus system bus."
+        sys.exit(1)
 
 try:
         manager = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.bluez.Manager')

-- 
Debian packaging for kdebluetooth4