Makke tdesvn-trinity conflict with libsvnqt4-trinity on Debian and Ubuntu

This resolves Bug 2193
10 years ago · 7c049bcf30
parent 4abc907c28
commit 7c049bcf30
3 changed files with 3 additions and 0 deletions
--- a/debian/lenny/applications/tdesvn/debian/control
+++ b/debian/lenny/applications/tdesvn/debian/control
@ -32,6 +32,7 @@ Description: TQt wrapper library for subversion (development files) [Trinity]
 Package: tdesvn-trinity
 Section: devel
 Architecture: any
+Conflicts: libsvnqt4-trinity
 Replaces: kdesvn-trinity (<< 4:14.0.0~)
 Breaks: kdesvn-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
--- a/debian/squeeze/applications/tdesvn/debian/control
+++ b/debian/squeeze/applications/tdesvn/debian/control
@ -32,6 +32,7 @@ Description: TQt wrapper library for subversion (development files) [Trinity]
 Package: tdesvn-trinity
 Section: devel
 Architecture: any
+Conflicts: libsvnqt4-trinity
 Replaces: kdesvn-trinity (<< 4:14.0.0~)
 Breaks: kdesvn-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
--- a/ubuntu/maverick/applications/tdesvn/debian/control
+++ b/ubuntu/maverick/applications/tdesvn/debian/control
@ -32,6 +32,7 @@ Description: TQt wrapper library for subversion (development files) [Trinity]
 Package: tdesvn-trinity
 Section: devel
 Architecture: any
+Conflicts: libsvnqt4-trinity
 Replaces: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~)
 Breaks: kdesvn-kde3 (<< 4:14.0.0~), kdesvn-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})