summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-11-22 02:38:27 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-11-22 02:38:27 +0100
commit4418a8abf51c9c605381ca374ba6cb6c17be7974 (patch)
tree594e7d506d0585ae2fd1c8628a1c6c8800c1378e /ubuntu
parent3b9c4c3c782084a46079f071670f06283fd6ccf1 (diff)
downloadtde-packaging-4418a8abf51c9c605381ca374ba6cb6c17be7974.tar.gz
tde-packaging-4418a8abf51c9c605381ca374ba6cb6c17be7974.zip
Fix circular dependency in tdebase on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/tdebase/debian/control4
1 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 47de154c6..0e6ab2dd3 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -33,7 +33,6 @@ Section: tde
Architecture: all
Replaces: kdebase-runtime-data-common-kde3 (<< 4:14.0.0~), kdebase-runtime-data-common-trinity (<< 4:14.0.0~)
Breaks: kdebase-runtime-data-common-kde3 (<< 4:14.0.0~), kdebase-runtime-data-common-trinity (<< 4:14.0.0~)
-Depends: tdebase-trinity
Description: Shared common files for Trinity and KDE4
.
Shared common files for both Trinity and KDE4
@@ -359,7 +358,8 @@ Architecture: any
Replaces: konqueror-kde3 (<< 4:14.0.0~), konqueror-trinity (<< 4:14.0.0~)
Breaks: konqueror-kde3 (<< 4:14.0.0~), konqueror-trinity (<< 4:14.0.0~)
Provides: info-browser, man-browser, www-browser, konqueror
-Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
+Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version})
+Recommends: konqueror-nsplugins-trinity
Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
Description: TDE's advanced file manager, web browser and document viewer