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

[Michael Biebl]

The following commit has been merged in the master branch:
commit fdfb3fe1c97afc93908a36fe0bfc05f69a5b98c8
Author: Michael Biebl <biebl at debian.org>
Date:   Wed Jun 2 00:39:47 2010 +0200

    Re-add plasma-widget-networkmanagement package
    
    and remove the Conflicts from network-manager-kde as both packages should
    now be co-installable.
---
 debian/changelog                               |    2 ++
 debian/control                                 |   18 +++++++++++++++++-
 debian/plasma-widget-networkmanagement.install |    3 +++
 3 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e93a207..eacbbbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ plasma-widget-networkmanagement (0.1~svn1133205-1) UNRELEASED; urgency=low
   * debian/network-manager-kde.install
     - No longer install the autostart file for knetworkmanager. Upstream
       recommends to use the plasma-widgets-networkmanagment frontend.
+  * Re-add plasma-widget-networkmanagement package and remove the Conflicts
+    from network-manager-kde as both packages should now be co-installable.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 02 Jun 2010 00:04:11 +0200
 
diff --git a/debian/control b/debian/control
index 07a32f6..5d79635 100644
--- a/debian/control
+++ b/debian/control
@@ -14,13 +14,29 @@ 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
  NetworkManager. It is mainly written for KDE but also works for other desktop
  environments like GNOME or Xfce.
 
+Package: plasma-widget-networkmanagement
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: kdebase-workspace-bin
+Conflicts: plasma-applet-networkmanager
+Replaces: plasma-applet-networkmanager
+Description: Network Management widget for KDE4 Plasma
+ This package contains the Network Management plasma widget which aims to
+ provide a fully featured GUI for managing networks.  Currently, the only
+ supported backend is NetworkManager.  Support for wired, wireless, GSM
+ and VPN networks are provided.  The widget is exclusively written for Plasma
+ and KDE4 and it is not supposed to work in other environments.
+ .
+ This widget needs Plasma shell to be usable. Main KDE 4 Plasma shell is
+ available in the kdebase-workspace-bin package. The user friendly name of the
+ widget is "Network Management" (in e.g. "Add Widgets" dialog).
+
 Package: knm-runtime
 Architecture: any
 Section: net
diff --git a/debian/plasma-widget-networkmanagement.install b/debian/plasma-widget-networkmanagement.install
new file mode 100644
index 0000000..f890c39
--- /dev/null
+++ b/debian/plasma-widget-networkmanagement.install
@@ -0,0 +1,3 @@
+usr/lib/kde4/plasma_applet_networkmanagement.so
+usr/share/kde4/services/plasma-applet-networkmanagement.desktop
+usr/share/kde4/apps/desktoptheme/default/icons/network.svgz

-- 
"Network Management" Plasma widget Debian packaging