[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.6.5-2-30-g9c67cbf

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 6dc52492bc9dc2c7d3863069816f5722616252eb
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Oct 22 02:16:51 2011 +0200

    Manage kdebase-runtime -> kde-runtime renaming.
---
 debian/changelog                     |    8 +++++++-
 debian/control                       |    2 +-
 debian/libkdecore5.lintian-overrides |    2 +-
 debian/libkdecore5.symbols           |    2 +-
 debian/libkdeui5.lintian-overrides   |    2 +-
 debian/libkdeui5.symbols             |    2 +-
 debian/rules                         |    2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25bb0ac..16421a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,13 @@ kde4libs (4:4.7.2-0r1) UNRELEASED; urgency=low
   * Remove package libkatepartinterfaces4.
   * Add package libkdeclarative5.
   * Update symbols files.
-  * Exclude kde-runtime from dh_shlibdeps results.
+  * Manage kdebase-runtime -> kde-runtime renaming:
+    - libkdecore and libkdeui symbols files pull kde-runtime instead of
+      kdebase-runtime.
+    - Update libkdecore and libkdeui lintian overrides.
+    - kdelibs5-plugins recommends kde-runtime instead of kdebase-runtime.
+    - Exclude kde-runtime (instead of kdebase-runtime) from dh_shlibdeps
+      results.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Aug 2011 01:03:43 +0200
 
diff --git a/debian/control b/debian/control
index c465877..fba2eac 100644
--- a/debian/control
+++ b/debian/control
@@ -472,7 +472,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
  kdelibs5-data (= ${source:Version}), kdoctools (= ${binary:Version}),
  kdelibs-bin (= ${binary:Version}),
  dbus-x11, shared-mime-info (>= 0.30), xdg-utils
-Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.6)
+Recommends: ttf-dejavu, kde-runtime
 Replaces: kdelibs5-dev (<< 4:4.6.2), kdelibs5-data (<< 4:4.6.3-3~)
 Breaks: kdelibs5-dev (<< 4:4.6.2), kdelibs5-data (<< 4:4.6.3-3~), kdevelop (<< 4:4.2)
 Description: core plugins for KDE Applications
diff --git a/debian/libkdecore5.lintian-overrides b/debian/libkdecore5.lintian-overrides
index 81ee8c3..ee32b78 100644
--- a/debian/libkdecore5.lintian-overrides
+++ b/debian/libkdecore5.lintian-overrides
@@ -1 +1 @@
-libkdecore5: symbols-declares-dependency-on-other-package kdebase-runtime*
+libkdecore5: symbols-declares-dependency-on-other-package kde-runtime*
diff --git a/debian/libkdecore5.symbols b/debian/libkdecore5.symbols
index 85d7fb8..d7c7725 100644
--- a/debian/libkdecore5.symbols
+++ b/debian/libkdecore5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.7.1 amd64
 libkdecore.so.5 libkdecore5 #MINVER#
-| libkdecore5 #MINVER#, kdebase-runtime
+| libkdecore5 #MINVER#, kde-runtime
 * Build-Depends-Package: kdelibs5-dev
  KTraderParse_initFlex at Base 4:4.3.4
  KTraderParse_mainParse at Base 4:4.3.4
diff --git a/debian/libkdeui5.lintian-overrides b/debian/libkdeui5.lintian-overrides
index 26f2535..8e8aa57 100644
--- a/debian/libkdeui5.lintian-overrides
+++ b/debian/libkdeui5.lintian-overrides
@@ -1 +1 @@
-libkdeui5: symbols-declares-dependency-on-other-package kdebase-runtime*
+libkdeui5: symbols-declares-dependency-on-other-package kde-runtime*
diff --git a/debian/libkdeui5.symbols b/debian/libkdeui5.symbols
index 5dfee35..cd6eef4 100644
--- a/debian/libkdeui5.symbols
+++ b/debian/libkdeui5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.7.1 amd64
 libkdeui.so.5 libkdeui5 #MINVER#
-| libkdeui5 #MINVER#, kdebase-runtime
+| libkdeui5 #MINVER#, kde-runtime
 * Build-Depends-Package: kdelibs5-dev
  _Z10BarIconSetRK7QStringi at Base 4:4.3.4
  _Z11DesktopIconRK7QStringiiRK11QStringList at Base 4:4.3.4
diff --git a/debian/rules b/debian/rules
index 66c2a13..f70bc0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_strip:
 
 # remove dependencies on kdebase-runtime and phonon (the metapackage)
 override_dh_shlibdeps:
-	$(overridden_command) -- -xkdebase-runtime -xphonon
+	$(overridden_command) -- -xkde-runtime -xphonon
 
 # Library stuff
 libpkgs_addsubst_allLibraries = kdelibs5-dev kdelibs5-dbg

-- 
KDE Development Platform Libraries module packaging