diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control index af20ea0ac..d85b99fbe 100644 --- a/debian/lenny/tdesdk/debian/control +++ b/debian/lenny/tdesdk/debian/control @@ -90,7 +90,7 @@ Breaks: kbabel-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends} Recommends: gettext Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html -Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +Conflicts: kdeartwork-theme-icon-trinity (<< 4:3.5.13.3~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Description: PO-file editing suite for Trinity This is a suite of programs for editing gettext message files (PO-files). It is designed to help you translate fast and consistently. diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control index af20ea0ac..d85b99fbe 100644 --- a/debian/squeeze/tdesdk/debian/control +++ b/debian/squeeze/tdesdk/debian/control @@ -90,7 +90,7 @@ Breaks: kbabel-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends} Recommends: gettext Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html -Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +Conflicts: kdeartwork-theme-icon-trinity (<< 4:3.5.13.3~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Description: PO-file editing suite for Trinity This is a suite of programs for editing gettext message files (PO-files). It is designed to help you translate fast and consistently. diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control index 5e8301d98..dd402f43e 100644 --- a/ubuntu/maverick/tdesdk/debian/control +++ b/ubuntu/maverick/tdesdk/debian/control @@ -90,7 +90,7 @@ Breaks: kbabel-kde3 (<< 4:14.0.0~), kbabel-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends} Recommends: gettext Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html -Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +Conflicts: kdeartwork-theme-icon-trinity (<< 4:3.5.13.3~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Description: PO-file editing suite for Trinity This is a suite of programs for editing gettext message files (PO-files). It is designed to help you translate fast and consistently.