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

[Michael Biebl]

The following commit has been merged in the master branch:
commit 4c4b832a06daf1d203bb1defb8d087c45ed28f74
Author: Michael Biebl <biebl at debian.org>
Date:   Tue Sep 14 22:39:22 2010 +0200

    Drop old Conflicts/Replaces: plasma-applet-networkmanager. No longer required.
---
 debian/changelog |    2 ++
 debian/control   |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 750b58f..6e31d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ plasma-widget-networkmanagement (0.1~svn1175124-1) UNRELEASED; urgency=low
     - Last Changed Rev: 1175124
     - Last Changed Date: 2010-09-14 11:30:18 +0200
   * Bump Standards-Version to 3.9.1. No further changes.
+  * Drop old Conflicts/Replaces: plasma-applet-networkmanager. No longer
+    required.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 14 Sep 2010 22:29:07 +0200
 
diff --git a/debian/control b/debian/control
index 5c58491..762c26c 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,6 @@ 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

-- 
"Network Management" Plasma widget Debian packaging