[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 9f2cc12e87ac77bc5e65cd6147451c46b467a3c5
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Jun 18 12:01:27 2010 +0200

    Re-add Conflicts between knm and plasmoid package
    
    As the NM kded module will claim the NetworkManagerUserSettings bus
    name and it is auto-loaded by default, it will break knm unless the user
    explicitly disables the kded service. We avoid this situation be
    re-adding the Conflicts between those two packages until the plasmoid
    has been fixed to load the kded service on-demand.
---
 debian/changelog |    3 +--
 debian/control   |    1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c8898c..446200f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,7 @@ plasma-widget-networkmanagement (0.1~svn1133205-1) UNRELEASED; urgency=low
   * debian/rules
     - Set -DINSTALL_KNM_AUTOSTART=ON to enable installation of knetworkmanager
       autostart file.
-  * Re-add plasma-widget-networkmanagement package and remove the Conflicts
-    from network-manager-kde as both packages should now be co-installable.
+  * Re-add plasma-widget-networkmanagement package.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 02 Jun 2010 00:04:11 +0200
 
diff --git a/debian/control b/debian/control
index 4625bdd..65a4ac4 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Package: network-manager-kde
 Architecture: any
 Section: net
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: plasma-widget-networkmanagement
 Provides: knetworkmanager
 Description: KDE system tray applet for controlling NetworkManager
  System tray applet for controlling network connections managed by

-- 
"Network Management" Plasma widget Debian packaging