[SCM] KDE metapackages branch, master, updated. debian/70-36-g3617be2

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Mon Nov 21 20:49:31 UTC 2011


The following commit has been merged in the master branch:
commit 2a852175d2f163ef81e345c443a8dae45b8b3fcc
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Nov 21 21:47:00 2011 +0100

    Manage some packages renaming.
---
 debian/changelog |    5 +++++
 debian/control   |   15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6aec1c1..005e0fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ meta-kde (5:71~pre14) UNRELEASED; urgency=low
   * Bump devPrev:Version to 4.7.2.
   * Set konqPlugins:Version to the value of kde:Version since konq-plugins is
     now part of the KDE SC.
+  * Manage the following renames in debian/control:
+    - kdebase-runtime -> kde-runtime
+    - kdebase-workspace -> kde-workspace
+    - kdebase-apps -> kde-baseapps
+    - kdebase-workspace-dev -> kde-workspace-dev
   * Add kdegraphics-libs-data transitional package.
   * Add Breaks to kde-sc-dev-latest against libksane-dev and libkdeedu-dev.
   * Add skanlite to kde-standard Suggests.
diff --git a/debian/control b/debian/control
index 6740ac7..5ae62d2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Homepage: http://www.kde.org
 
 Package: kde-plasma-desktop
 Architecture: any
-Depends: ${misc:Depends}, kdebase-runtime (>= ${kde:Version}),
- plasma-desktop (>= ${kde:Version}), kdebase-workspace (>= ${kde:Version}),
- kdebase-apps (>= ${kde:Version}),
+Depends: ${misc:Depends}, kde-runtime (>= ${kde:Version}),
+ plasma-desktop (>= ${kde:Version}), kde-workspace (>= ${kde:Version}),
+ kde-baseapps (>= ${kde:Version}),
  udisks [linux-any], upower [linux-any], hal [!linux-any]
 Breaks: kde-minimal (<< 5:57)
 Recommends: kdm (>= ${kde:Version}), xserver-xorg
@@ -27,9 +27,9 @@ Description: KDE Plasma Desktop and minimal set of applications
 
 Package: kde-plasma-netbook
 Architecture: any
-Depends: ${misc:Depends}, kdebase-runtime (>= ${kde:Version}),
- plasma-netbook (>= ${kde:Version}), kdebase-workspace (>= ${kde:Version}),
- kdebase-apps (>= ${kde:Version}),
+Depends: ${misc:Depends}, kde-runtime (>= ${kde:Version}),
+ plasma-netbook (>= ${kde:Version}), kde-workspace (>= ${kde:Version}),
+ kde-baseapps (>= ${kde:Version}),
  udisks [linux-any], upower [linux-any], hal [!linux-any]
 Recommends: kdm (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
@@ -156,7 +156,8 @@ Depends: ${misc:Depends}, debhelper (>= 7.3.16~), cmake (>= 2.6.4),
  automoc (>= 1.0~version-0.9.88), pkg-kde-tools (>= 0.12)
 Breaks: kdelibs5-dev (<< ${devLatest:Version}),
  kdepimlibs5-dev (<< ${devLatest:Version}),
- kdebase-workspace-dev (<< ${devLatest:Version}),
+ kde-workspace-dev (<< ${devLatest:Version}),
+ kdebase-workspace-dev,
  libkexiv2-dev (<< ${devPrev:Version}), libkdcraw-dev (<< ${devPrev:Version}),
  libkipi-dev (<< ${devPrev:Version}), libmarble-dev (<< ${devPrev:Version}),
  libkonq5-dev (<< ${devPrev:Version}), libksane-dev (<< ${devPrev:Version}),

-- 
KDE metapackages



More information about the pkg-kde-commits mailing list