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

Fathi Boudra fabo at alioth.debian.org
Thu Mar 4 16:29:28 UTC 2010


The following commit has been merged in the master branch:
commit 3df09ee4cb476920926ed8614ccdc0d16ceceadb
Author: Fathi Boudra <fabo at kde.org>
Date:   Thu Mar 4 17:29:21 2010 +0100

    Remove kblueplugd and kblueplugd.desktop as they are replaced by autostart file
---
 debian/changelog          |    2 +
 debian/kblueplugd         |   64 ---------------------------------------------
 debian/kblueplugd.desktop |   42 -----------------------------
 debian/rules              |    6 ----
 4 files changed, 2 insertions(+), 112 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62fb9e4..ca1c4f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ kbluetooth (1:0.4.2-1) UNRELEASED; urgency=low
   * Update debian/rules:
     - Enable parallel build (pass --parallel option to dh)
     - Use kde sequence addon (pass --with kde option to dh)
+  * Remove kblueplugd and kblueplugd.desktop as they are replaced by
+    autostart file
   * Merge from Ubuntu:
     - Add kubuntu_02_autostart.diff patch
     - Don't depend on the bluetooth metapackage, but instead on the individual
diff --git a/debian/kblueplugd b/debian/kblueplugd
deleted file mode 100644
index dd6f80a..0000000
--- a/debian/kblueplugd
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-"""
-Copyright (C) 2007 Achim Bohnet <allee at kubuntu.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-"""
-
-import sys
-from   PyQt4 import QtCore, Qt
-import dbus
-import dbus.mainloop.qt
-import distutils.spawn
-
-kbtcmd    = [ 'kbluetooth' ]
-quitprogs = [ 'kbluetooth' ]
-
-
-app = Qt.QCoreApplication(sys.argv)
-	
-dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
-
-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')
-except:
-        print "Unable to connect to bluez."
-        sys.exit(1)
-
-if len(manager.ListAdapters()):
-        print "# of devices at startup:", len(manager.ListAdapters())
-        distutils.spawn.spawn(kbtcmd)
-else:
-        print "No BT device found"
-
-
-def slotAdapterAdded(device):
-        print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
-        distutils.spawn.spawn(kbtcmd)
-
-def slotAdapterRemoved(device):
-        print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
-        if len(manager.ListAdapters()) == 0:
-                for p in quitprogs:
-                        print "exiting:", p, " ..."
-                        try:
-				distutils.spawn.spawn(['killall', p])
-                        except:
-                                pass
-
-manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
-manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
-
-print "waiting for bt device (un)plug events ..."
-
-app.exec_()
diff --git a/debian/kblueplugd.desktop b/debian/kblueplugd.desktop
deleted file mode 100644
index 3c7e537..0000000
--- a/debian/kblueplugd.desktop
+++ /dev/null
@@ -1,42 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=KBluetoothD
-Name[sv]=Kbluetoothd
-Name[ta]=Kபுலுடுத்D
-Name[xx]=xxKBluetoothDxx
-GenericName=KDE Bluetooth Daemon
-GenericName[ar]=مراقب KDE Bluetooth
-GenericName[bg]=Демон за Bluetooth в KDE
-GenericName[br]=Diaoul KDE Bluetooth
-GenericName[bs]=KDE Bluetooth daemon
-GenericName[ca]=Dimoni Bluetooth de KDE
-GenericName[cs]=Bluetooth démon pro KDE
-GenericName[da]=KDE Bluetooth-dæmon
-GenericName[de]=KDE Bluetooth-Daemon
-GenericName[el]=Ο δαίμονας Bluetooth του KDE
-GenericName[es]=Daemon Bluetooth de KDE
-GenericName[et]=KDE Bluetoothi deemon
-GenericName[fr]=Démon KDE Bluetooth
-GenericName[gl]=Servizo Bluetooth de KDE
-GenericName[it]=Demone Bluetooth di KDE
-GenericName[ja]=KDE Bluetooth デーモン
-GenericName[ka]=KDE ბლუთუს დემონი
-GenericName[nl]=KDE Bluetooth-daemon
-GenericName[pa]=KDE ਬਲਿਊਟੁੱਥ ਡਾਈਮੋਨ
-GenericName[pl]=Demon Bluetooth dla KDE
-GenericName[pt]=Serviço Bluetooth do KDE
-GenericName[ru]=Служба KDE Bluetooth
-GenericName[sr]=Bluetooth демон за KDE
-GenericName[sr at Latn]=Bluetooth demon za KDE
-GenericName[sv]=KDE-Blåtandsdemon
-GenericName[ta]=KDE புலுடுத் டேமொன்
-GenericName[tr]=KDE Bluetooth Hizmeti
-GenericName[xx]=xxKDE Bluetooth Daemonxx
-Exec=kblueplugd
-Icon=kdebluetooth
-Type=Application
-DocPath=kdebluetooth/index.html
-Terminal=false
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-KDE-autostart-condition=kbluetoothrc:General:AutoStart:true
diff --git a/debian/rules b/debian/rules
index 66a6a31..a76b465 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,4 @@
 %:
 	dh --parallel --with kde $@
 
-override_dh_install:
-	install -D -p -m0755 debian/kblueplugd \
-		$(CURDIR)/debian/kdebluetooth/usr/bin/kblueplugd
-	install -D -p -m0644 debian/kblueplugd.desktop \
-		$(CURDIR)/debian/kdebluetooth/usr/share/autostart/kblueplugd.desktop
-
 .PHONY: override_dh_auto_test

-- 
Debian packaging for kdebluetooth4



More information about the pkg-kde-commits mailing list