diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-11-22 02:38:27 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-11-22 02:38:27 +0100 |
| commit | 4418a8abf51c9c605381ca374ba6cb6c17be7974 (patch) | |
| tree | 594e7d506d0585ae2fd1c8628a1c6c8800c1378e | |
| parent | 3b9c4c3c782084a46079f071670f06283fd6ccf1 (diff) | |
| download | tde-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>
| -rw-r--r-- | debian/lenny/tdebase/debian/control | 4 | ||||
| -rw-r--r-- | debian/squeeze/tdebase/debian/control | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/control | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control index 97d91886d..062bd0c79 100644 --- a/debian/lenny/tdebase/debian/control +++ b/debian/lenny/tdebase/debian/control @@ -33,7 +33,6 @@ Section: tde Architecture: all Replaces: kdebase-runtime-data-common-trinity (<< 4:14.0.0~) Breaks: 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-trinity (<< 4:14.0.0~) Breaks: 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 diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control index d166fd57c..de9b16e66 100644 --- a/debian/squeeze/tdebase/debian/control +++ b/debian/squeeze/tdebase/debian/control @@ -33,7 +33,6 @@ Section: tde Architecture: all Replaces: kdebase-runtime-data-common-trinity (<< 4:14.0.0~) Breaks: 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-trinity (<< 4:14.0.0~) Breaks: 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 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 |