diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:18:25 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:18:25 +0200 |
| commit | ae2d5b2b5a415f53527d5b64a455b449ac638dc5 (patch) | |
| tree | b821d8ed3662238394dc24ccf5927e7883265cf4 /debian | |
| parent | add6f7daeb73021b5842eee36242d5ff4c9ab0db (diff) | |
| download | tde-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 'debian')
| -rw-r--r-- | debian/lenny/tdesdk/debian/control | 3 | ||||
| -rw-r--r-- | debian/squeeze/tdesdk/debian/control | 3 |
2 files changed, 4 insertions, 2 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. |