summaryrefslogtreecommitdiffstats
path: root/debian/squeeze
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-10-02 20:14:16 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-10-02 20:14:16 -0500
commit68d1f8b3fcbf6dd815ad8b62485a981133bddbbf (patch)
tree0f66b224e4b9ef624362675adddb3b5bab5cfbef /debian/squeeze
parentef37ab66d281c033bb70304719e0853a5c28d1a1 (diff)
downloadtde-packaging-68d1f8b3fcbf6dd815ad8b62485a981133bddbbf.tar.gz
tde-packaging-68d1f8b3fcbf6dd815ad8b62485a981133bddbbf.zip
Conflict with kdesdk-kio-plugins-trinity in kdesvn-kio-plugins-trinity on Debian and Ubuntu, as both packages attempt to provide an SVN kioslave
Diffstat (limited to 'debian/squeeze')
-rw-r--r--debian/squeeze/applications/kdesvn/debian/control1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/squeeze/applications/kdesvn/debian/control b/debian/squeeze/applications/kdesvn/debian/control
index c7849ea5e..a90ca64c8 100644
--- 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