[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-1-31-g663b60c

George Kiagiadakis gkiagia-guest at alioth.debian.org
Mon Aug 2 22:47:51 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 663b60cdaf9c260e4c076224b67d1bbcad27abce
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Tue Aug 3 01:47:33 2010 +0300

    kdebase-workspace-bin replaces kdebase-data << 4:4.5.0 due to the moved desktoppath.desktop file.
---
 debian/changelog |    2 ++
 debian/control   |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 170810f..2d2cc27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ kdebase-workspace (4:4.5.0-0r1) UNRELEASED; urgency=low
       << 4:4.5.0 due to the moved themerc files.
     - kdebase-workspace-bin replaces kdebase-runtime << 4:4.5.0
       due to the moved oxygen style plugin.
+    - kdebase-workspace-bin replaces kdebase-data << 4:4.5.0
+      due to the moved desktoppath.desktop file.
   * Move some misplaced files from kdebase-workspace-bin and
     kdebase-workspace-data to plasma-desktop and add the necessary replaces.
   * Move the kinfocenter package from kdebase here, and as a consequence:
diff --git a/debian/control b/debian/control
index d532bb2..66ea1b3 100644
--- a/debian/control
+++ b/debian/control
@@ -94,7 +94,8 @@ Suggests: x11-xkb-utils
 Conflicts: kcontrol, libplasma1, libplasma2, libkfontinst4, ksplash
 Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
  kde-window-manager (<< 4:4.1.80), kdebase-workspace-data (<< 4:4.1.82),
- kdebase-workspace-libs4+5, libkfontinst4, ksplash, kdebase-runtime (<< 4:4.5.0)
+ kdebase-workspace-libs4+5, libkfontinst4, ksplash, kdebase-runtime (<< 4:4.5.0),
+ kdebase-data (<< 4:4.5.0)
 Description: core binaries for the KDE Plasma Workspace
  This package contains miscellaneous programs needed for a basic desktop
  installation. Among other standard KDE Workspace components, the package

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list