Conflict with kdesdk-kio-plugins-trinity in kdesvn-kio-plugins-trinity on Debian and Ubuntu, as both packages attempt to provide an SVN kioslave

13 years ago · 68d1f8b3fc
parent ef37ab66d2
commit 68d1f8b3fc
3 changed files with 3 additions and 0 deletions
--- a/debian/lenny/applications/kdesvn/debian/control
+++ b/debian/lenny/applications/kdesvn/debian/control
@ -44,6 +44,7 @@ Package: kdesvn-kio-plugins-trinity
 Section: devel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kdesdk-kio-plugins-trinity
 Description: subversion I/O slaves for Trinity
 This packages includes KIO slaves for svn, svn+file, svn+http, 
 svn+https, svn+ssh. This allows you to access subversion repositories 
--- a/debian/squeeze/applications/kdesvn/debian/control
+++ b/debian/squeeze/applications/kdesvn/debian/control
@ -44,6 +44,7 @@ Package: kdesvn-kio-plugins-trinity
 Section: devel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kdesdk-kio-plugins-trinity
 Description: subversion I/O slaves for Trinity
 This packages includes KIO slaves for svn, svn+file, svn+http, 
 svn+https, svn+ssh. This allows you to access subversion repositories 
--- a/ubuntu/maverick/applications/kdesvn/debian/control
+++ b/ubuntu/maverick/applications/kdesvn/debian/control
@ -52,6 +52,7 @@ Architecture: any
 Replaces: kdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Breaks: kdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kdesdk-kio-plugins-trinity
 Description: subversion I/O slaves for Trinity
 This packages includes KIO slaves for svn, svn+file, svn+http, 
 svn+https, svn+ssh. This allows you to access subversion repositories