[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1+git20110422.810bc16-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit bf6c9a7bdb95da9c589c27ecce5b926bbf34e469
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Apr 22 22:49:18 2011 +0300

    Make network-manager-kde a transitional package.
    
    (for plasma-widget-networkmanagement)
---
 debian/changelog                   |    2 ++
 debian/control                     |   20 ++++++++------------
 debian/network-manager-kde.install |    4 ----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a99293..42e70f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ networkmanagement (0.1+git20110422.810bc16-0r1) UNRELEASED; urgency=low
   * Point Vcs-* fields to the new location of packaging VCS.
   * Use my @debian.org address in debian/control and debian/copyright.
   * Update packaging section in debian/copyright.
+  * Convert network-manager-kde to the transitional package for
+    plasma-widget-networkmanagement.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 02 Apr 2011 00:25:25 +0300
 
diff --git a/debian/control b/debian/control
index 726c7dc..80a12ff 100644
--- a/debian/control
+++ b/debian/control
@@ -10,17 +10,6 @@ Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-kde/kde-extras/networkmanagement.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/networkmanagement.git
 
-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}
@@ -55,11 +44,18 @@ Description: KDE NetworkManagement infrastructure runtime files
  notifications under KDE but actual network management functions will be very
  limited.
 
+Package: network-manager-kde
+Architecture: any
+Depends: ${misc:Depends}, plasma-widget-networkmanagement
+Description: transitional package for plasma-widget-networkmanagement
+ This is a dummy transitional package for plasma-widget-networkmanagement. You
+ may safely remove it.
+
 Package: plasma-widget-networkmanagement-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, network-manager-kde (= ${knetworkmanager:Version})
+Depends: ${misc:Depends}, plasma-widget-networkmanagement (= ${binary:Version})
 Recommends: kdelibs5-dbg
 Suggests: kdebase-workspace-dbg
 Description: debugging symbols for KDE Network Management
diff --git a/debian/network-manager-kde.install b/debian/network-manager-kde.install
deleted file mode 100644
index ad31737..0000000
--- a/debian/network-manager-kde.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/knetworkmanager
-usr/share/applications/kde4/knetworkmanager.desktop
-usr/share/autostart/kde4-knetworkmanager-autostart.desktop
-usr/share/icons/hicolor/32x32/apps/knetworkmanager.png

-- 
"Network Management" Plasma widget Debian packaging