diff options
| author | Timothy Pearson <[email protected]> | 2011-10-02 20:14:16 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-10-02 20:14:16 -0500 |
| commit | 68d1f8b3fcbf6dd815ad8b62485a981133bddbbf (patch) | |
| tree | 0f66b224e4b9ef624362675adddb3b5bab5cfbef | |
| parent | ef37ab66d281c033bb70304719e0853a5c28d1a1 (diff) | |
| download | tde-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
| -rw-r--r-- | debian/lenny/applications/kdesvn/debian/control | 1 | ||||
| -rw-r--r-- | debian/squeeze/applications/kdesvn/debian/control | 1 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kdesvn/debian/control | 1 |
3 files changed, 3 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 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 |