summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-04-08 15:04:40 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-04-08 15:04:40 +0200
commit6a6adc42e1fee90e1928441e00ee44776a413cb5 (patch)
tree9e2be54fe7030cb476aa2d6579e4ad07a26ca431
parent392da19b273b40d12988b3d55fea64659af66c6e (diff)
downloadtde-packaging-6a6adc42e1fee90e1928441e00ee44776a413cb5.tar.gz
tde-packaging-6a6adc42e1fee90e1928441e00ee44776a413cb5.zip
DEB tdesdk: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/lenny/tdesdk/debian/control3
-rw-r--r--debian/squeeze/tdesdk/debian/control3
-rw-r--r--ubuntu/maverick/tdesdk/debian/control3
3 files changed, 3 insertions, 6 deletions
diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control
index af20ea0ac..a2f1ce2d7 100644
--- a/debian/lenny/tdesdk/debian/control
+++ b/debian/lenny/tdesdk/debian/control
@@ -86,11 +86,10 @@ Package: kbabel-trinity
Architecture: any
Section: devel
Replaces: kbabel-trinity (<< 4:14.0.0~)
-Breaks: kbabel-trinity (<< 4:14.0.0~)
+Breaks: kbabel-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
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 af20ea0ac..a2f1ce2d7 100644
--- a/debian/squeeze/tdesdk/debian/control
+++ b/debian/squeeze/tdesdk/debian/control
@@ -86,11 +86,10 @@ Package: kbabel-trinity
Architecture: any
Section: devel
Replaces: kbabel-trinity (<< 4:14.0.0~)
-Breaks: kbabel-trinity (<< 4:14.0.0~)
+Breaks: kbabel-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
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 5e8301d98..83250cea5 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -86,11 +86,10 @@ 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~)
+Breaks: kbabel-kde3 (<< 4:14.0.0~), kbabel-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
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.