From ae2d5b2b5a415f53527d5b64a455b449ac638dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 9 Apr 2017 01:18:25 +0200 Subject: [PATCH] Revert "DEB tdesdk: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks" This reverts commit fbc56dc936f26e2a2ff6b0dfbcba3b670821c72f. --- debian/lenny/tdesdk/debian/control | 3 ++- debian/squeeze/tdesdk/debian/control | 3 ++- ubuntu/maverick/tdesdk/debian/control | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control index a2f1ce2d7..af20ea0ac 100644 --- a/debian/lenny/tdesdk/debian/control +++ b/debian/lenny/tdesdk/debian/control @@ -86,10 +86,11 @@ Package: kbabel-trinity Architecture: any Section: devel Replaces: kbabel-trinity (<< 4:14.0.0~) -Breaks: kbabel-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) 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 a2f1ce2d7..af20ea0ac 100644 --- a/debian/squeeze/tdesdk/debian/control +++ b/debian/squeeze/tdesdk/debian/control @@ -86,10 +86,11 @@ Package: kbabel-trinity Architecture: any Section: devel Replaces: kbabel-trinity (<< 4:14.0.0~) -Breaks: kbabel-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) 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 83250cea5..5e8301d98 100644 --- a/ubuntu/maverick/tdesdk/debian/control +++ b/ubuntu/maverick/tdesdk/debian/control @@ -86,10 +86,11 @@ Package: kbabel-trinity Architecture: any Section: devel Replaces: kbabel-kde3 (<< 4:14.0.0~), kbabel-trinity (<< 4:14.0.0~) -Breaks: kbabel-kde3 (<< 4:14.0.0~), kbabel-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) 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.