From 68d1f8b3fcbf6dd815ad8b62485a981133bddbbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 2 Oct 2011 20:14:16 -0500 Subject: Conflict with kdesdk-kio-plugins-trinity in kdesvn-kio-plugins-trinity on Debian and Ubuntu, as both packages attempt to provide an SVN kioslave --- ubuntu/maverick/applications/kdesvn/debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/applications/kdesvn/debian/control b/ubuntu/maverick/applications/kdesvn/debian/control index e3d86ed80..8345fa9de 100644 --- 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 -- cgit v1.2.3