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

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Mon Jan 17 04:10:12 UTC 2011


The following commit has been merged in the master branch:
commit f8509ed3d480e5f001b972d0dd210bd91db62f1b
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Jan 16 22:11:47 2011 +0000

    kdebase-runtime-data replaces kdebase-workspace-bin (<< 4:4.5.95)
---
 debian/changelog |    2 ++
 debian/control   |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29d73e3..850a8f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ kdebase-runtime (4:4.5.95-0r1) UNRELEASED; urgency=low
     - kdebase-runtime-data replaces plasma-widget-networkmanagement <=
       0.1~svn1175124-1 because they both install
       /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
   * 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 c5dfd2a..7de649f 100644
--- a/debian/control
+++ b/debian/control
@@ -54,11 +54,12 @@ Architecture: all
 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-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1175124-1),
+ kdebase-workspace-bin (<< 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),
- phonon-backend-xine (<< 4:4.2.80)
+ kdebase-workspace-bin (<< 4:4.5.95), phonon-backend-xine (<< 4:4.2.80)
 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



More information about the pkg-kde-commits mailing list