summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2017-04-08 15:04:40 +0200
committerSlávek Banko <[email protected]>2017-04-08 15:05:03 +0200
commitfbc56dc936f26e2a2ff6b0dfbcba3b670821c72f (patch)
tree779bd293a6418b79549e0e89a14328878c994427 /debian
parent6900db68bad5110e1d71d3bdb17ae1bbe5848925 (diff)
downloadtde-packaging-fbc56dc936f26e2a2ff6b0dfbcba3b670821c72f.tar.gz
tde-packaging-fbc56dc936f26e2a2ff6b0dfbcba3b670821c72f.zip
DEB tdesdk: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 6a6adc42e1fee90e1928441e00ee44776a413cb5)
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdesdk/debian/control3
-rw-r--r--debian/squeeze/tdesdk/debian/control3
2 files changed, 2 insertions, 4 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.