diff options
| author | Slávek Banko <[email protected]> | 2017-04-09 01:17:48 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2017-04-09 01:17:48 +0200 |
| commit | c9f1f5014fd8f1be5e5c29fd16baa6a750914dc1 (patch) | |
| tree | 4f2c882d02899ede6e91d2c58d36380b66770d4c | |
| parent | 07ba7a2172defc0fac4758a0380c421c58118bc8 (diff) | |
| download | tde-packaging-c9f1f5014fd8f1be5e5c29fd16baa6a750914dc1.tar.gz tde-packaging-c9f1f5014fd8f1be5e5c29fd16baa6a750914dc1.zip | |
Revert "DEB tdesdk: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks"
This reverts commit 6a6adc42e1fee90e1928441e00ee44776a413cb5.
| -rw-r--r-- | debian/lenny/tdesdk/debian/control | 3 | ||||
| -rw-r--r-- | debian/squeeze/tdesdk/debian/control | 3 | ||||
| -rw-r--r-- | ubuntu/maverick/tdesdk/debian/control | 3 |
3 files changed, 6 insertions, 3 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. 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. |