diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/lenny/applications/kdesvn/debian/control | 1 | ||||
-rw-r--r-- | debian/squeeze/applications/kdesvn/debian/control | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/lenny/applications/kdesvn/debian/control b/debian/lenny/applications/kdesvn/debian/control index c7849ea5e..a90ca64c8 100644 --- 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 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 |