summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:18:25 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:18:25 +0200
commitae2d5b2b5a415f53527d5b64a455b449ac638dc5 (patch)
treeb821d8ed3662238394dc24ccf5927e7883265cf4 /ubuntu/maverick
parentadd6f7daeb73021b5842eee36242d5ff4c9ab0db (diff)
downloadtde-packaging-ae2d5b2b5a415f53527d5b64a455b449ac638dc5.tar.gz
tde-packaging-ae2d5b2b5a415f53527d5b64a455b449ac638dc5.zip
Revert "DEB tdesdk: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks"
This reverts commit fbc56dc936f26e2a2ff6b0dfbcba3b670821c72f.
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/tdesdk/debian/control3
1 files changed, 2 insertions, 1 deletions
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.