diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:22:52 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:23:07 +0200 |
commit | e83b43771bac387808d9994b4a4a21a749501aab (patch) | |
tree | e33133ec228fe51d564e64504ddad087b50a5b3f | |
parent | b7f7059d07f0db6b652e9684d2afdce8754fdf6b (diff) | |
download | tde-packaging-e83b43771bac387808d9994b4a4a21a749501aab.tar.gz tde-packaging-e83b43771bac387808d9994b4a4a21a749501aab.zip |
DEB tdesdk: Add kdeartwork-theme-icon-trinity to Conflicts
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9874e408c349a444f84483c721af348f2c00357d)
-rw-r--r-- | debian/lenny/tdesdk/debian/control | 2 | ||||
-rw-r--r-- | debian/squeeze/tdesdk/debian/control | 2 | ||||
-rw-r--r-- | ubuntu/maverick/tdesdk/debian/control | 2 |
3 files changed, 3 insertions, 3 deletions
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. |