summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/tdebase/debian/control
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-02-23 22:42:45 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-02-23 22:46:13 +0900
commit33ec3dcbba58098f766a5d75455222cc7aa6ca86 (patch)
treedc992d586fc6f663f897b7f756988f60d721660e /ubuntu/_base/tdebase/debian/control
parent42c9bb2916cf79906909d72b808ee33fd554f57a (diff)
downloadtde-packaging-33ec3dcbba58098f766a5d75455222cc7aa6ca86.tar.gz
tde-packaging-33ec3dcbba58098f766a5d75455222cc7aa6ca86.zip
DEB: invert dependency between kcontrol and kicker. This resolves bug 1385.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit d9a39a491e349ee0f52b8e8d7985539d9e0267ba)
Diffstat (limited to 'ubuntu/_base/tdebase/debian/control')
-rw-r--r--ubuntu/_base/tdebase/debian/control4
1 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/_base/tdebase/debian/control b/ubuntu/_base/tdebase/debian/control
index 399ac3c11..fde096d21 100644
--- a/ubuntu/_base/tdebase/debian/control
+++ b/ubuntu/_base/tdebase/debian/control
@@ -323,9 +323,9 @@ Section: tde
Architecture: any
Replaces: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~)
Breaks: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, kcontrol-trinity (>= ${source:Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~)
Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
-Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:14.0.8~)
Description: desktop panel for TDE
Kicker provides the TDE panel on you desktop. It can be used as a
program launcher and can load plugins to provide additional