[SCM] KDE Base Workspace module packaging branch, kde4.6, updated. debian/4.6.5-2-3-gd7c2597

[Pino Toscano]

The following commit has been merged in the kde4.6 branch:
commit 595a946767762a004f8504a48b8805eea98f66f2
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 16 13:56:58 2011 +0200

    temporarly disable the network-manager stuff (#640393)
    
    the backend is not compiled with NM >= 0.9
    
    kde 4.7.1 should bring a version compiling with it
---
 debian/changelog                            |    3 +++
 debian/kdebase-workspace-bin.install.linux  |    2 --
 debian/kdebase-workspace-data.install.linux |    3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 321c5ba..57137c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdebase-workspace (4:4.6.5-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Disable the NetworkManager-related files, as they are not compiled with
+    NM >= 0.9. (Closes: #640393)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 15 Sep 2011 23:02:00 +0200
 
diff --git a/debian/kdebase-workspace-bin.install.linux b/debian/kdebase-workspace-bin.install.linux
index bbafe12..b5bfce7 100644
--- a/debian/kdebase-workspace-bin.install.linux
+++ b/debian/kdebase-workspace-bin.install.linux
@@ -1,7 +1,5 @@
 usr/bin/solid-network
 usr/lib/kde4/kcm_joystick.so
 usr/lib/kde4/solid_modemmanager04.so
-usr/lib/kde4/solid_networkmanager07.so
 usr/share/kde4/services/joystick.desktop
 usr/share/kde4/services/solidbackends/solid_modemmanager04.desktop
-usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
diff --git a/debian/kdebase-workspace-data.install.linux b/debian/kdebase-workspace-data.install.linux
index fd93fd9..7f1043c 100644
--- a/debian/kdebase-workspace-data.install.linux
+++ b/debian/kdebase-workspace-data.install.linux
@@ -3,6 +3,3 @@ usr/share/doc/kde/HTML/en/kcontrol/joystick/index.cache.bz2
 usr/share/doc/kde/HTML/en/kcontrol/joystick/index.docbook
 usr/share/doc/kde/HTML/en/kcontrol/joystick/joystick-calibration.png
 usr/share/doc/kde/HTML/en/kcontrol/joystick/joystick-main.png
-usr/share/icons/oxygen/22x22/apps/networkmanager.png
-usr/share/icons/oxygen/32x32/apps/networkmanager.png
-usr/share/icons/oxygen/64x64/apps/networkmanager.png

-- 
KDE Base Workspace module packaging