[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1-svn1125524-1-12-gf34a8e7

[Michael Biebl]

The following commit has been merged in the master branch:
commit c3292b4affa7feb30147edb380a30379c191a082
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Jun 18 12:11:05 2010 +0200

    Move the networkmanagement kded module
    
    from knm-runtime to plasma-widget-networkmanagement.
    The kded service is not used by knetworkmanager and actually breaks knetworkmanager
    due to being auto-loaded and claiming the NetworkManagerUserSettings bus name.
---
 debian/changelog                               |    4 ++++
 debian/knm-runtime.install                     |    2 --
 debian/plasma-widget-networkmanagement.install |    2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 446200f..df6bb6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ plasma-widget-networkmanagement (0.1~svn1133205-1) UNRELEASED; urgency=low
     - Set -DINSTALL_KNM_AUTOSTART=ON to enable installation of knetworkmanager
       autostart file.
   * Re-add plasma-widget-networkmanagement package.
+  * Move the networkmanagement kded module from knm-runtime to
+    plasma-widget-networkmanagement. The kded service is not used by
+    knetworkmanager and actually breaks knetworkmanager due to being
+    auto-loaded and claiming the NetworkManagerUserSettings bus name.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 02 Jun 2010 00:04:11 +0200
 
diff --git a/debian/knm-runtime.install b/debian/knm-runtime.install
index 18a7c14..ee333b6 100644
--- a/debian/knm-runtime.install
+++ b/debian/knm-runtime.install
@@ -1,7 +1,6 @@
 etc/dbus-1/system.d/NetworkManager-kde4.conf
 usr/lib/kde4/kcm_networkmanagement.so
 usr/lib/kde4/kcm_networkmanagement_tray.so
-usr/lib/kde4/kded_networkmanagement.so
 usr/lib/kde4/libexec/networkmanagement_configshell
 usr/lib/kde4/networkmanagement_novellvpnui.so
 usr/lib/kde4/networkmanagement_openvpnui.so
@@ -18,7 +17,6 @@ usr/share/icons/oxygen/
 usr/share/kde4/apps/networkmanagement/networkmanagement.notifyrc
 usr/share/kde4/services/kcm_networkmanagement.desktop
 usr/share/kde4/services/kcm_networkmanagement_tray.desktop
-usr/share/kde4/services/kded/networkmanagement.desktop
 usr/share/kde4/services/networkmanagement_novellvpnui.desktop
 usr/share/kde4/services/networkmanagement_openvpnui.desktop
 usr/share/kde4/services/networkmanagement_pptpui.desktop
diff --git a/debian/plasma-widget-networkmanagement.install b/debian/plasma-widget-networkmanagement.install
index f890c39..981a62a 100644
--- a/debian/plasma-widget-networkmanagement.install
+++ b/debian/plasma-widget-networkmanagement.install
@@ -1,3 +1,5 @@
 usr/lib/kde4/plasma_applet_networkmanagement.so
+usr/lib/kde4/kded_networkmanagement.so
 usr/share/kde4/services/plasma-applet-networkmanagement.desktop
+usr/share/kde4/services/kded/networkmanagement.desktop
 usr/share/kde4/apps/desktoptheme/default/icons/network.svgz

-- 
"Network Management" Plasma widget Debian packaging