summaryrefslogtreecommitdiffstats
path: root/dilos/tdebase/debian/control
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-03-02 23:05:25 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-04-10 14:58:48 +0200
commit7861c407d9bd26cc35bcd7dfccb9133a32050df1 (patch)
tree8296a61871092cde25f6ccf6d12158b54f37d4e6 /dilos/tdebase/debian/control
parentad54761f64c48b756133e5d9be8ddfe6dd60b5b6 (diff)
downloadtde-packaging-7861c407d9bd26cc35bcd7dfccb9133a32050df1.tar.gz
tde-packaging-7861c407d9bd26cc35bcd7dfccb9133a32050df1.zip
DilOS tdebase: Invert dependency between kcontrol and kicker.
This resolves bug 1385. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 59e9776ac2de4f5006b9a16ef7da0dd21fbd9ccc)
Diffstat (limited to 'dilos/tdebase/debian/control')
-rw-r--r--dilos/tdebase/debian/control4
1 files changed, 2 insertions, 2 deletions
diff --git a/dilos/tdebase/debian/control b/dilos/tdebase/debian/control
index 7a31bcd6a..6b743c769 100644
--- a/dilos/tdebase/debian/control
+++ b/dilos/tdebase/debian/control
@@ -323,9 +323,9 @@ Section: tde
Architecture: any
Replaces: kicker-trinity (<< 4:14.0.0~)
Breaks: 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