Revert "DEB tdesdk: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks"

This reverts commit fbc56dc936.
8 years ago · ae2d5b2b5a
parent add6f7daeb
commit ae2d5b2b5a
3 changed files with 6 additions and 3 deletions
--- 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.
--- 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.
--- 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.