[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.4.5-1-78-g3132cdd

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 333b3d10204d7a5236301e05aa1da48fe52a8ea6
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Apr 2 01:09:23 2011 +0300

    Add plasma-netbook (<< 4:4.5.95) to kdebase-runtime-data replaces/breaks as well.
    
    Fixes:
    
    dpkg: error processing /var/cache/apt/archives/kdebase-runtime-data_4%3a4.6.1-0r6_amd64.deb (--unpack):
    trying to overwrite '/usr/share/kde4/services/plasma-containment-newspaper.desktop', which is also in package plasma-netbook 4:4.5.1-0r2
---
 debian/changelog |    4 ++--
 debian/control   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35730fc..486c88d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,8 +53,8 @@ kdebase-runtime (4:4.6.1-0r6) UNRELEASED; urgency=low
       /usr/share/kde4/apps/desktoptheme/default/icons/network.svgz
     - kdebase-runtime-data replaces kdebase-workspace-bin (<< 4:4.5.95)
       because of /usr/share/kde4/services/kded/networkstatus.desktop
-    - kdebase-runtime replaces plasma-netbook (<< 4:4.5.95)
-      because of /usr/lib/kde4/plasma_containment_newspaper.so
+    - kdebase-runtime(-data) replaces plasma-netbook (<< 4:4.5.95)
+      because of plasma_containment_newspaper.{so,desktop}
   * Update installed files.
   * Call dh_xine in rules, kde-config-phonon-xine now depends on
     ${xine-x:Depends} (Closes: #575120)
diff --git a/debian/control b/debian/control
index adba1f7..e9545e2 100644
--- a/debian/control
+++ b/debian/control
@@ -57,12 +57,12 @@ Depends: ${perl:Depends}, ${misc:Depends}
 Replaces: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs5-data (<< 4:4.5.0),
  kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<= 4:4.2.4-1),
  kdebase-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1175124-1),
- kdebase-workspace-bin (<< 4:4.5.95)
+ kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95)
 Breaks: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs5-data (<< 4:4.5.0),
  kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<= 4:4.2.4-1),
  kdebase-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1175124-1),
  kdebase-workspace-bin (<< 4:4.5.95), phonon-backend-xine (<< 4:4.2.80),
- plasma-widget-networkmanagement (<< 0.1+git20110318.941cde9-2~)
+ plasma-widget-networkmanagement (<< 0.1+git20110318.941cde9-2~), plasma-netbook (<< 4:4.5.95)
 Description: shared data files for the KDE base runtime module
  This package contains the architecture-independent shared data files needed to
  run KDE applications.

-- 
KDE Base Runtime module packaging