[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-115-g9e66792

Modestas Vainius modax at alioth.debian.org
Sat Apr 2 00:09:38 UTC 2011


The following commit has been merged in the master branch:
commit 9e667926f9c4bac9dd90d86a369f61d990d66593
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Apr 2 01:56:44 2011 +0300

    Make plasma-desktop Break pre-4.6 plasma-widget-networkmanagement.
    
    Symbol clashes (from libsolidcontrol4) cause a crash.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec3c2dc..eb1f04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -150,6 +150,8 @@ kdebase-workspace (4:4.6.1-0r4) UNRELEASED; urgency=low
     patch.
   * Add kdebase-runtime-dbg (<< 4:4.5) to kdebase-workspace-dbg
     Replaces/Breaks due to moved oxygen style plugin.
+  * Make plasma-desktop Break pre-4.6 plasma-widget-networkmanagement. Symbol
+    clashes (from libsolidcontrol4) cause a crash.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Mar 2011 16:53:05 +0300
 
diff --git a/debian/control b/debian/control
index e5bb6ef..58da895 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Recommends: kdebase-workspace
 Replaces: kdebase-workspace-bin (<< 4:4.5.0), kdebase-workspace-data (<< 4:4.5.0),
  plasma-widgets-workspace (<< 4:4.4.0)
 Breaks: kdebase-workspace-bin (<< 4:4.5.0), kdebase-workspace-data (<< 4:4.5.0),
- plasma-widgets-workspace (<< 4:4.4.0)
+ plasma-widgets-workspace (<< 4:4.4.0), plasma-widget-networkmanagement (<< 0.1+git20110318.941cde9-10~)
 Description: KDE Plasma workspace for desktop and laptop computers
  Provides the environment for running and managing applications and integrating
  interaction of applications. It is designed as generic environment for all

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list