[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2-63-g6343192
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Sat Dec 18 10:18:51 UTC 2010
The following commit has been merged in the master branch:
commit 6343192f0fb02f1bb545c1f518019bd87513f9e5
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Sat Dec 18 11:17:04 2010 +0100
kdelibs5-data breaks/replaces kdebase-runtime-data (<< 4:4.5.85).
---
debian/changelog | 1 +
debian/control | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8180565..19f801a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,7 @@ kde4libs (4:4.5.86-0r1) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Disable 23_solid_no_double_build.diff, produces FTBFS.
* Update installed files.
+ * kdelibs5-data breaks/replaces kdebase-runtime-data (<< 4:4.5.85).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 05 Dec 2010 14:54:10 +0100
diff --git a/debian/control b/debian/control
index 36868c3..308aaea 100644
--- a/debian/control
+++ b/debian/control
@@ -530,9 +530,11 @@ Architecture: all
Pre-Depends: debconf | debconf-2.0
Depends: ${perl:Depends}, ${misc:Depends}, hicolor-icon-theme
Replaces: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-1),
- kdelibs-data (<< 4:3.5.10.dfsg.1-5), kdelibs5-dev (<< 4:4.4.2)
+ kdelibs-data (<< 4:3.5.10.dfsg.1-5), kdelibs5-dev (<< 4:4.4.2),
+ kdebase-runtime-data (<< 4:4.5.85)
Breaks: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-1),
- kdelibs-data (<< 4:3.5.10.dfsg.1-5), kdelibs5-dev (<< 4:4.4.2)
+ kdelibs-data (<< 4:3.5.10.dfsg.1-5), kdelibs5-dev (<< 4:4.4.2),
+ kdebase-runtime-data (<< 4:4.5.85)
Conflicts: kjscmd (<< 4:3.5.10-1)
Description: core shared data for all KDE Applications
This package contains architecture-independent data files needed to run KDE
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list